mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

Update to OOD680_m1.

Browse Source 
This is the snapshot from release branch of OOo.
http://development.openoffice.org/releases/2.0.OOD_m1_snapshot.html
This branch will become 2.0.4, thus I set version number for this
release as 2.0.4.m1.

According to Martin H.
http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=9787
we again use OOo_2.0.1_source.tar.gz for the filename
which is the same as 2.0.1 release.
This commit is contained in:
Maho Nakata 2006-08-19 12:10:14 +00:00
parent 80dac07975
commit e68108efb8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=170984
96 changed files with 174 additions and 54000 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editors/openoffice-3/Makefile
View File

@ -13,21 +13,25 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
#DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
DISTFILES+= OOo_2.0.1_src.tar.gz
DISTFILES+= unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
#EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
EXTRACT_ONLY= OOo_2.0.1_src.tar.gz
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
OOOVERSION= 2.0.3
OOOVERSION= 2.0.4.m1
NO_LATEST_LINK= yes
USE_GNOME= gtk20 gnomevfs2
MOZILLA_VERSION= 1.7.5
@ -71,7 +75,7 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
OOOTAG?= OOC680_m7
OOOTAG?= OOD680_m1
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
@ -153,11 +157,9 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
.if (${GCCVER} == 41)
@ -197,6 +199,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
@ -254,10 +257,10 @@ post-install:
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
.if defined(WITH_KDE)
@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applnk/${EXECBASE}
@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \

9
editors/openoffice-3/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = f68832ff3458664ae2b741ec67d30104
SHA256 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 31c82e971763827c5f55d036bbb4d6e7c7a732ca73e37ce56312b276d1a0a7b5
SIZE (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 307317482
MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 45545bcaa0733eefdce158010c42e638
SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = a3361d325c125e30f59b2cc502c3e7937cb902dcc9ec4efc7909049521554610
SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 319068872
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

54
editors/openoffice-3/files/patch-i64442
View File

@ -1,54 +0,0 @@
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000
@@ -63,13 +63,8 @@
char const* const* GnuInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#ifdef X86_64
- "/lib64/libgcj.so.7",
- "/lib64/libgcj.so.6"
-#else
- "/lib/libgcj.so.7",
- "/lib/libgcj.so.6"
-#endif
+ "/libgcj.so.7",
+ "/libgcj.so.6"
};
*size = sizeof(ar) / sizeof (char*);
return ar;
@@ -87,7 +82,7 @@
OUString sVersionProperty(
RTL_CONSTASCII_USTRINGPARAM("java.version"));
OUString sHomeProperty(
- RTL_CONSTASCII_USTRINGPARAM("java.home"));
+ RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
OUString sAccessProperty(
RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -111,19 +106,8 @@
}
else if (!bHome && sHomeProperty.equals(i->first))
{
- OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
- osl_File_E_None)
- {
- //make sure that the drive letter have all the same case
- //otherwise file:///c:/jre and file:///C:/jre produce two
- //different objects!!!
- if (makeDriveLetterSame( & fileURL))
- {
- m_sHome = fileURL;
- bHome = true;
- }
- }
+ m_sHome = i->second;
+ bHome = true;
}
else if (!bAccess && sAccessProperty.equals(i->first))
{

19
editors/openoffice-3/files/patch-i64762
View File

@ -1,19 +0,0 @@
Index: sal/osl/unx/security.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/security.c,v
retrieving revision 1.18
diff -u -r1.18 security.c
--- sal/osl/unx/security.c 20 Apr 2006 16:24:05 -0000 1.18
+++ sal/osl/unx/security.c 25 Apr 2006 21:35:23 -0000
@@ -57,6 +57,11 @@
#define PAM_BINARY_MSG 6
#endif
+#include <stdint.h> //C99 contains SIZE_MAX
+#ifndef SIZE_MAX
+#define SIZE_MAX (sizeof (size_t) -1)
+#endif
+
extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
static oslSecurityError SAL_CALL

4767
editors/openoffice-3/files/patch-i64815
View File

File diff suppressed because it is too large Load Diff

11
editors/openoffice-3/files/patch-i64906
View File

@ -1,11 +0,0 @@
--- sal/osl/unx/security.c~ Wed May 10 20:57:40 2006
+++ sal/osl/unx/security.c Wed May 10 22:35:43 2006
@@ -73,7 +73,7 @@
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#ifdef MACOSX
+#if defined (MACOSX) || defined (FREEBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
size_t n = 1024;
#else

2718
editors/openoffice-3/files/patch-i65467
View File

File diff suppressed because it is too large Load Diff

33
editors/openoffice-3/files/patch-i65468
View File

@ -1,33 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.9
diff -u -r1.9 epm-3.7.patch
--- epm/epm-3.7.patch 17 Feb 2006 16:16:42 -0000 1.9
+++ epm/epm-3.7.patch 15 May 2006 21:54:11 -0000
@@ -659,3 +659,25 @@
putc(*s, fp);
}
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Mon May 15 13:48:17 2006
+***************
+*** 348,355 ****
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...
+--- 348,356 ----
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tbz %s", name, directory))
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...

18
editors/openoffice-3/files/patch-i65511
View File

@ -1,18 +0,0 @@
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig Wed Sep 7 15:31:11 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Thu May 25 14:20:37 2006
@@ -76,6 +76,7 @@
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif
@@ -90,6 +91,7 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

61
editors/openoffice-3/files/patch-i65512
View File

@ -1,61 +0,0 @@
--- sal/osl/unx/socket.c.orig Thu Sep 8 11:01:17 2005
+++ sal/osl/unx/socket.c Fri May 5 19:14:17 2006
@@ -813,7 +813,7 @@
const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop)
{
-#ifdef LINUX
+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
struct hostent *__result; /* will be the same as result */
int __error;
__error = gethostbyname_r (name, result, buffer, buflen,
--- sal/osl/unx/system.c.orig Fri Apr 7 04:06:25 2006
+++ sal/osl/unx/system.c Fri May 5 19:18:51 2006
@@ -343,6 +343,8 @@
}
#endif /* defined SCO */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -433,6 +435,7 @@
return res;
}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#if defined(MACOSX)
/*
--- sal/osl/unx/system.h.orig Thu May 4 04:48:25 2006
+++ sal/osl/unx/system.h Wed May 24 16:06:13 2006
@@ -543,8 +543,10 @@
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#endif
#endif /* __OSL_SYSTEM_H__ */
--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006
+++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006
@@ -7697,3 +7697,15 @@
# Force applications to be built non-statically
# when building the mozcomps meta component
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004
++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006
+@@ -105,7 +105,8 @@
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
+
+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
++ (defined(__FreeBSD__) && __FreeBSD_version > 601103)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

591
editors/openoffice-3/files/patch-i65513
View File

@ -1,591 +0,0 @@
--- config_office/set_soenv.in Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Tue May 23 14:31:50 2006
@@ -320,32 +320,60 @@
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
-{ print "Setting FreeBSD specific values... ";
- $outfile = "FreeBSDEnv.Set";
- $BIG_SVX = "TRUE";
+{ $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
- $CPU = "I";
- $CPUNAME = "INTEL";
$CVER = "C300";
$GUI = "UNX";
$GUIBASE = "unx";
$GUIENV = "sal";
$GVER = "VCL";
- $OUTPATH = "unxfbsd";
- $INPATH = $OUTPATH.$PROEXT;
- $GVERDIR = $INPATH;
$OS = "FREEBSD";
$PATH_SEPERATOR = $ps;
$XPVERSION = "3";
$OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^amd64/)
+ { my ( $JAVA_OS );
+ print "Setting FreeBSD AMD64 specific values... ";
+ $outfile = "FreeBSDAMDEnv.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxfbsdx";
+ $JAVA_OS = '@JAVA_HOME@';
+ $JAVA_OS =~ s/.*\///;
+ if ($JAVA_OS =~ m/^linux/)
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ }
+ else
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }
+ }
+ elsif ($platform =~ m/^i386/)
+ { print "Setting FreeBSD Intel specific values... ";
+ $outfile = "FreeBSDIntelEnv.Set";
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $OUTPATH = "unxfbsdi";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- if( @GCCVER@ >= 30401 ) {
- $CVER = "C341";
- }
+ }
+ else
+ { print "Unsupported FreeBSD architecture: $platform \n";
+ exit 1;
+ }
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
+ $INPATH = $OUTPATH.$PROEXT;
+ $GVERDIR = $INPATH;
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -963,8 +991,7 @@
$D.$OS.
$D.$CPUNAME;
if ($platform =~ m/freebsd/)
- { $SOLARDEF .= $D."X86".
- $D."OSVERSION=$OSVERSION".
+ { $SOLARDEF .= $D."OSVERSION=$OSVERSION".
" @PTHREAD_CFLAGS@";
}
$SOLARDEF .= $D."_REENTRANT".
@@ -1294,6 +1321,7 @@
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--- solenv/inc/unx.mk Fri May 19 13:55:04 2006
+++ solenv/inc/unx.mk Fri May 19 13:38:42 2006
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-.INCLUDE : unxfbsdi.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
--- solenv/inc/unxfbsd.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsd.mk Fri May 19 13:52:02 2006
@@ -0,0 +1,220 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+# Makefile for FreeBSD.
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
+
+# Include arch specific makefile.
+.IF "$(CPUNAME)" == "INTEL"
+.INCLUDE : unxfbsdi.mk
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+.INCLUDE : unxfbsdx.mk
+.ENDIF
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+PICSWITCH:=-fpic
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+# Enable all warnings
+CFLAGSWALL=-Wall
+# Set default warn level
+CFLAGSDFLTWARN=
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+STDLIBGUIST=-lX11 -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
--- solenv/inc/unxfbsdi.mk Tue Jan 31 13:24:38 2006
+++ solenv/inc/unxfbsdi.mk Fri May 19 13:52:19 2006
@@ -33,192 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
+#
+# FreBSD/i386 specific defines
+#
-SOLAR_JAVA*=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
+CDEFS+=-DX86
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=-mtune=pentiumpro
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
-CFLAGSOBJGUIST=
-# Compiler flags for compiling static object in single threaded environment with character user interface
-CFLAGSOBJCUIST=
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-CFLAGSOPT+=-Wuninitialized # not supported without optimization
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
+CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-# Enable all warnings
-CFLAGSWALL=-Wall
-# Set default warn level
-CFLAGSDFLTWARN=
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBCUIST=-lm
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-STDLIBGUIST=-lX11 -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-STDSHLGUIST=-lX11 -lXext -lm
-STDSHLCUIST=-lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
# platform specific identifier for shared libs
DLLPOSTFIX=fi
-DLLPRE=lib
-DLLPOST=.so
-
--- solenv/inc/unxfbsdx.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsdx.mk Fri May 19 13:52:38 2006
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+#
+# FreBSD/amd64 specific defines
+#
+
+CDEFS+=-DX86_64
+
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+.IF "$(CPUNAME)" == "X86_64"
+ARCH_FLAGS*=
+.ENDIF
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

140
editors/openoffice-3/files/patch-i65514
View File

@ -1,140 +0,0 @@
--- berkeleydb/db-4.2.52.patch.orig Fri Dec 23 09:22:46 2005
+++ berkeleydb/db-4.2.52.patch Fri May 19 17:44:11 2006
@@ -205,6 +205,20 @@
! $(SLO)$/dbreg_util.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006
+***************
+*** 193,198 ****
+--- 193,201 ----
+ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
+ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
+
++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100
--- misc/build/db-4.2.52.NC/dist/configure 2005-12-22 18:36:14.647415000 +0100
***************
@@ -241,6 +255,76 @@
fi
# Commands to make compiler produce verbose output that lists
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
++ if test "$db_cv_mutex" = no; then
++ cat >conftest.$ac_ext <<_ACEOF
++ #line $LINENO "configure"
++ /* confdefs.h. */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h. */
++
++ int
++ main ()
++ {
++
++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
++ exit(0);
++ #else
++ FAIL TO COMPILE/LINK
++ #endif
++
++ ;
++ return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ db_cv_mutex="x86_64/gcc-assembly"
++ else
++ echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++
++ fi
++ rm -f conftest.$ac_objext conftest.$ac_ext
++ fi
++
+ # S390/cc: IBM OS/390 Unix
+ if test "$db_cv_mutex" = no; then
+ cat >conftest.$ac_ext <<_ACEOF
+***************
+*** 28971,28976 ****
+--- 29016,29028 ----
+ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
++ _ACEOF
++
++
++ ;;
++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++ cat >>confdefs.h <<\_ACEOF
++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
+ _ACEOF
+
+
*** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
--- misc/build/db-4.2.52.NC/dist/ltmain.sh 2005-12-22 18:36:14.447413000 +0100
***************
@@ -943,3 +1027,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003
+--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006
+***************
+*** 781,786 ****
+--- 781,811 ----
+ #endif
+ #endif
+
++ /*********************************************************************
++ * x86_64/gcc assembly.
++ *********************************************************************/
++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++ typedef unsigned char tsl_t;
++
++ #ifdef LOAD_ACTUAL_MUTEX_CODE
++ /*
++ * For gcc/x86-64, 0 is clear, 1 is set.
++ */
++ #define MUTEX_SET(tsl) ({ \
++ register tsl_t *__l = (tsl); \
++ int __r; \
++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
++ : "=&a" (__r), "=m" (*__l) \
++ : "1" (*__l) \
++ ); \
++ __r & 1; \
++ })
++
++ #define MUTEX_UNSET(tsl) (*(tsl) = 0)
++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
++ #endif
++ #endif
++
+ /*
+ * Mutex alignment defaults to one byte.
+ *

16
editors/openoffice-3/files/patch-i66064
View File

@ -1,16 +0,0 @@
Index: unx/source/gdi/salprnpsp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
retrieving revision 1.40
diff -u -r1.40 salprnpsp.cxx
--- vcl/unx/source/gdi/salprnpsp.cxx 22 Mar 2006 09:46:43 -0000 1.40
+++ vcl/unx/source/gdi/salprnpsp.cxx 27 May 2006 00:31:26 -0000
@@ -101,6 +101,8 @@
// NETBSD has no RTLD_GLOBAL
#ifndef RTLD_GLOBAL
#define DLOPEN_MODE (RTLD_LAZY)
+#elif defined(FREEBSD)
+#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL)
#else
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
#endif

29
editors/openoffice-3/files/patch-i66065
View File

@ -1,29 +0,0 @@
--- tools/inc/inetdef.hxx.orig Fri Sep 9 09:42:51 2005
+++ tools/inc/inetdef.hxx Thu May 25 18:31:02 2006
@@ -65,7 +65,9 @@
#elif defined LINUX && defined X86
#define TOOLS_INETDEF_OS "Linux"
#elif defined FREEBSD && defined X86
-#define TOOLS_INETDEF_OS "FreeBSD"
+#define TOOLS_INETDEF_OS "FreeBSD/i386"
+#elif defined FREEBSD && defined X86_64
+#define TOOLS_INETDEF_OS "FreeBSD/amd64"
#elif defined SINIX
#define TOOLS_INETDEF_OS "SINIX"
#elif defined IRIX
--- tools/inc/solar.h.orig Wed Apr 26 16:42:59 2006
+++ tools/inc/solar.h Thu May 25 18:37:19 2006
@@ -397,9 +397,12 @@
#elif defined LINUX && defined __x86_64__
#define __DLLEXTENSION "lx.so"
#define SYSTEM_ID SYSTEM_UNXLNXX
-#elif defined FREEBSD
+#elif defined FREEBSD && defined X86
#define __DLLEXTENSION "fi.so"
#define SYSTEM_ID SYSTEM_UNXFBSDI
+#elif defined FREEBSD && defined X86_64
+ #define __DLLEXTENSION "fx.so"
+ #define SYSTEM_ID SYSTEM_UNXFBSDX
#elif defined IRIX
#define __DLLEXTENSION "im.so"
#define SYSTEM_ID SYSTEM_UNXIRXM

516
editors/openoffice-3/files/patch-i66666
View File

@ -19,519 +19,3 @@ diff -u -r1.44 solar.h
#undef _SOLAR__PRIVATE
#endif
Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.11
diff -u -r1.11 SalGtkFilePicker.cxx
--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11
+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -208,7 +208,7 @@
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL );
+ (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -347,7 +347,7 @@
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_pack_start (column, cell, FALSE);
- gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
}
@@ -377,7 +377,7 @@
PangoRectangle row_height;
pango_layout_set_markup (layout, "All Files", -1);
pango_layout_get_pixel_extents (layout, NULL, &row_height);
- g_object_get (cell, "ypad", &ypad, NULL);
+ g_object_get (cell, "ypad", &ypad, (void *)NULL);
guint height = (row_height.height + 2*ypad) * 5;
gtk_widget_set_size_request (m_pFilterView, -1, height);
gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -1414,7 +1414,7 @@
}
if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
g_object_set( pWidget, "label", aTxt.getStr(),
- "use_underline", TRUE, NULL );
+ "use_underline", TRUE, (void *)NULL );
else
OSL_TRACE("Can't set label on list\n");
}
Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
retrieving revision 1.6
diff -u -r1.6 SalGtkFolderPicker.cxx
--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 8 Sep 2005 23:35:19 -0000 1.6
+++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -125,7 +125,7 @@
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.27
diff -u -r1.27 salnativewidgets-gtk.cxx
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 11 May 2006 10:00:59 -0000 1.27
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 16 Jun 2006 00:59:16 -0000
@@ -550,7 +550,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
Rectangle aForward;
Rectangle aBackward;
@@ -910,7 +910,7 @@
gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
gtk_widget_style_get( pWidget,
"indicator_size", &indicator_size,
- NULL );
+ (void *)NULL );
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
(rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
@@ -928,7 +928,7 @@
gtk_widget_style_get( widget,
"indicator_size", &indicator_size,
"indicator_spacing", &indicator_spacing,
- NULL);
+ (void *)NULL);
indicator_size += 2*indicator_spacing; // guess overpaint of theme
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
@@ -978,7 +978,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1081,7 +1081,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1134,7 +1134,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1192,7 +1192,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1291,7 +1291,7 @@
"stepper_size", &stepper_size,
"trough_border", &trough_border,
"stepper_spacing", &stepper_spacing,
- "min_slider_length", &min_slider_length, NULL );
+ "min_slider_length", &min_slider_length, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
gboolean has_backward;
@@ -1300,7 +1300,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint magic = trough_border ? 1 : 0;
gint nFirst = 0;
@@ -1570,7 +1570,7 @@
gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
"stepper-size", &stepper_size,
"trough-border", &trough_border,
- "stepper-spacing", &stepper_spacing, NULL );
+ "stepper-spacing", &stepper_spacing, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
@@ -1580,7 +1580,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint buttonWidth;
gint buttonHeight;
Rectangle buttonRect;
@@ -1687,7 +1687,7 @@
// Grab some entry style attributes
gtk_widget_style_get( gEditBoxWidget, "focus-line-width", &focusWidth,
- "interior-focus", &interiorFocus, NULL );
+ "interior-focus", &interiorFocus, (void *)NULL );
if ( !interiorFocus )
{
@@ -1838,7 +1838,7 @@
}
NWSetWidgetState( gSpinButtonWidget, nState, stateType );
- gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
+ gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
if ( shadowType != GTK_SHADOW_NONE )
{
@@ -2048,7 +2048,7 @@
// Grab some button style attributes
gtk_widget_style_get( gDropdownWidget, "focus-line-width", &nFocusWidth,
- "focus-padding", &nFocusPad, NULL );
+ "focus-padding", &nFocusPad, (void *)NULL );
nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
nButtonWidth = nArrowWidth +
@@ -2272,7 +2272,7 @@
"interior_focus", &bInteriorFocus,
"focus_line_width", &nFocusLineWidth,
"focus_padding", &nFocusPadding,
- NULL);
+ (void *)NULL);
}
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -2482,7 +2482,7 @@
{
gtk_widget_style_get( gMenuItemMenubarWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
}
@@ -2571,7 +2571,7 @@
{
gtk_widget_style_get( gMenuItemMenuWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
NWSetWidgetState( gMenuWidget, nState, stateType );
@@ -2730,7 +2730,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
width = pIndicatorSize->width;
@@ -2791,7 +2791,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
{
@@ -3074,11 +3074,11 @@
GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
gboolean blink = false;
- g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
if( blink )
{
gint blink_time = STYLE_CURSOR_NOBLINKTIME;
- g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
// set the blink_time if there is a setting and it is reasonable
// else leave the default value
if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -3097,7 +3097,7 @@
"slider-width", &slider_width,
"trough-border", &trough_border,
"min-slider-length", &min_slider_length,
- NULL );
+ (void *)NULL );
gint magic = trough_border ? 1 : 0;
aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
aStyleSet.SetMinThumbSize( min_slider_length - magic );
@@ -3439,7 +3439,7 @@
gtk_widget_ensure_style( gToolbarWidget );
gtk_widget_style_get( gToolbarWidget,
"button_relief", &aRelief,
- NULL);
+ (void *)NULL);
gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
Index: vcl/unx/source/app/i18n_cb.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
retrieving revision 1.28
diff -u -r1.28 i18n_cb.cxx
--- vcl/unx/source/app/i18n_cb.cxx 19 Apr 2006 13:56:47 -0000 1.28
+++ vcl/unx/source/app/i18n_cb.cxx 16 Jun 2006 00:59:17 -0000
@@ -463,8 +463,8 @@
point.y = mPosEvent.mnY + mPosEvent.mnHeight;
XVaNestedList preedit_attr;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
- XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
+ XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
return;
@@ -600,7 +600,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( ic,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
Index: vcl/unx/source/app/i18n_ic.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_ic.cxx
--- vcl/unx/source/app/i18n_ic.cxx 16 Jan 2006 13:07:29 -0000 1.35
+++ vcl/unx/source/app/i18n_ic.cxx 16 Jun 2006 00:59:17 -0000
@@ -137,7 +137,7 @@
a_dstlist = XVaCreateNestedList(
0,
name, value,
- NULL );
+ (void *)NULL );
}
else
{
@@ -145,7 +145,7 @@
0,
XNVaNestedList, a_srclist,
name, value,
- NULL );
+ (void *)NULL );
}
return a_dstlist != NULL ? a_dstlist : a_srclist ;
@@ -263,7 +263,7 @@
XNStatusStartCallback, &aStatusStartCallback,
XNStatusDoneCallback, &aStatusDoneCallback,
XNStatusDrawCallback, &aStatusDrawCallback,
- NULL );
+ (void *)NULL );
break;
}
@@ -302,7 +302,7 @@
XNPreeditDoneCallback, &maPreeditDoneCallback,
XNPreeditDrawCallback, &maPreeditDrawCallback,
XNPreeditCaretCallback, &maPreeditCaretCallback,
- NULL );
+ (void *)NULL );
break;
@@ -324,7 +324,7 @@
mpPreeditAttributes = XVaCreateNestedList (
0,
XNSpotLocation, &aSpot,
- NULL );
+ (void *)NULL );
// XCreateIC() fails on Redflag Linux 2.0 if there is no
// fontset though the data itself is not evaluated nor is
@@ -357,7 +357,7 @@
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
XNInputStyle, mnPreeditStyle | mnStatusStyle,
- NULL );
+ (void *)NULL );
if ( mnPreeditStyle != XIMPreeditNone )
{
@@ -377,7 +377,7 @@
}
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
}
if ( maContext == NULL )
@@ -416,7 +416,7 @@
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if ( maContext != NULL)
{
@@ -424,7 +424,7 @@
maDestroyCallback.client_data = (XPointer)this;
XSetICValues( maContext,
XNDestroyCallback, &maDestroyCallback,
- NULL );
+ (void *)NULL );
}
if( mbMultiLingual )
@@ -433,7 +433,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( maContext,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
@@ -481,12 +481,12 @@
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
if ( maContext != NULL && mbMultiLingual )
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if( maClientData.pFrame != pFrame )
SetICFocus( pFrame );
@@ -529,7 +529,7 @@
&aWindowAttributes );
XGetICValues ( maContext,
XNFilterEvents, &nIMEventMask,
- NULL);
+ (void *)NULL);
nIMEventMask |= aWindowAttributes.your_event_mask;
XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
}
@@ -685,8 +685,8 @@
aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
- XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
I18NStatus::get().show( true, I18NStatus::contextmap );
@@ -717,7 +717,7 @@
XSetICValues( maContext,
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
- NULL );
+ (void *)NULL );
if( maClientData.aInputEv.mpTextAttr )
{
@@ -761,8 +761,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, &preedit_state,
- NULL);
- if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
+ (void *)NULL);
+ if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
{
XFree(preedit_attr);
@@ -770,8 +770,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, preedit_state,
- NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
}
XFree(preedit_attr);
Index: vcl/unx/source/app/i18n_im.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_im.cxx
--- vcl/unx/source/app/i18n_im.cxx 7 Apr 2006 08:04:45 -0000 1.35
+++ vcl/unx/source/app/i18n_im.cxx 16 Jun 2006 00:59:17 -0000
@@ -427,13 +427,13 @@
mbMultiLingual = False;
else
if ( XGetIMValues(maMethod,
- XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
+ XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
mbMultiLingual = False;
if( mbMultiLingual )
{
XIMUnicodeCharacterSubsets* subsets;
if( XGetIMValues( maMethod,
- XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
+ XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
@@ -473,7 +473,7 @@
if ( maMethod != (XIM)NULL )
{
- if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
+ if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
!= NULL)
mbUseable = False;
#if OSL_DEBUG_LEVEL > 1
@@ -496,7 +496,7 @@
maDestroyCallback.callback = (XIMProc)IM_IMDestroyCallback;
maDestroyCallback.client_data = (XPointer)this;
if (mbUseable && maMethod != NULL)
- XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
+ XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
return mbUseable;
}
Index: vcl/unx/source/app/i18n_status.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
retrieving revision 1.30
diff -u -r1.30 i18n_status.cxx
--- vcl/unx/source/app/i18n_status.cxx 16 Jan 2006 13:08:00 -0000 1.30
+++ vcl/unx/source/app/i18n_status.cxx 16 Jun 2006 00:59:17 -0000
@@ -502,7 +502,7 @@
XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
XNUnicodeCharacterSubset,
rChoices[nIndex].pData,
- NULL);
+ (void *)NULL);
// FIXME: get rid of X11SalFrame
X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
if( pParent && pParent->isMapped() )

20
editors/openoffice-3/files/patch-i66667
View File

@ -1,10 +1,10 @@
Index: gtkinst.cxx
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
retrieving revision 1.13
diff -u -r1.13 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13
+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000
retrieving revision 1.14.88.1
diff -u -r1.14.88.1 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1
+++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000
@@ -43,6 +43,7 @@
#include <plugins/gtk/atkbridge.hxx>
@ -13,15 +13,14 @@ diff -u -r1.13 gtkinst.cxx
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -111,13 +112,28 @@
@@ -111,11 +112,26 @@
GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsLeave();
}
- static bool hookLocks( oslModule pModule )
+ static bool hookLocks( void )
{
- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ /* XXX GDK library path should be set by configure. */
@ -40,11 +39,8 @@ diff -u -r1.13 gtkinst.cxx
+ }
+
GdkLockFn gdk_threads_set_lock_functions =
- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
if ( !gdk_threads_set_lock_functions )
{
#if OSL_DEBUG_LEVEL > 1
@@ -150,7 +166,7 @@
if ( !g_thread_supported() )
g_thread_init( NULL );

27
editors/openoffice.org-2-RC/Makefile
View File

@ -13,21 +13,25 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
#DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
DISTFILES+= OOo_2.0.1_src.tar.gz
DISTFILES+= unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
#EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
EXTRACT_ONLY= OOo_2.0.1_src.tar.gz
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
OOOVERSION= 2.0.3
OOOVERSION= 2.0.4.m1
NO_LATEST_LINK= yes
USE_GNOME= gtk20 gnomevfs2
MOZILLA_VERSION= 1.7.5
@ -71,7 +75,7 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
OOOTAG?= OOC680_m7
OOOTAG?= OOD680_m1
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
@ -153,11 +157,9 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
.if (${GCCVER} == 41)
@ -197,6 +199,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
@ -254,10 +257,10 @@ post-install:
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
.if defined(WITH_KDE)
@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applnk/${EXECBASE}
@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \

9
editors/openoffice.org-2-RC/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = f68832ff3458664ae2b741ec67d30104
SHA256 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 31c82e971763827c5f55d036bbb4d6e7c7a732ca73e37ce56312b276d1a0a7b5
SIZE (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 307317482
MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 45545bcaa0733eefdce158010c42e638
SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = a3361d325c125e30f59b2cc502c3e7937cb902dcc9ec4efc7909049521554610
SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 319068872
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

54
editors/openoffice.org-2-RC/files/patch-i64442
View File

@ -1,54 +0,0 @@
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000
@@ -63,13 +63,8 @@
char const* const* GnuInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#ifdef X86_64
- "/lib64/libgcj.so.7",
- "/lib64/libgcj.so.6"
-#else
- "/lib/libgcj.so.7",
- "/lib/libgcj.so.6"
-#endif
+ "/libgcj.so.7",
+ "/libgcj.so.6"
};
*size = sizeof(ar) / sizeof (char*);
return ar;
@@ -87,7 +82,7 @@
OUString sVersionProperty(
RTL_CONSTASCII_USTRINGPARAM("java.version"));
OUString sHomeProperty(
- RTL_CONSTASCII_USTRINGPARAM("java.home"));
+ RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
OUString sAccessProperty(
RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -111,19 +106,8 @@
}
else if (!bHome && sHomeProperty.equals(i->first))
{
- OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
- osl_File_E_None)
- {
- //make sure that the drive letter have all the same case
- //otherwise file:///c:/jre and file:///C:/jre produce two
- //different objects!!!
- if (makeDriveLetterSame( & fileURL))
- {
- m_sHome = fileURL;
- bHome = true;
- }
- }
+ m_sHome = i->second;
+ bHome = true;
}
else if (!bAccess && sAccessProperty.equals(i->first))
{

19
editors/openoffice.org-2-RC/files/patch-i64762
View File

@ -1,19 +0,0 @@
Index: sal/osl/unx/security.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/security.c,v
retrieving revision 1.18
diff -u -r1.18 security.c
--- sal/osl/unx/security.c 20 Apr 2006 16:24:05 -0000 1.18
+++ sal/osl/unx/security.c 25 Apr 2006 21:35:23 -0000
@@ -57,6 +57,11 @@
#define PAM_BINARY_MSG 6
#endif
+#include <stdint.h> //C99 contains SIZE_MAX
+#ifndef SIZE_MAX
+#define SIZE_MAX (sizeof (size_t) -1)
+#endif
+
extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
static oslSecurityError SAL_CALL

4767
editors/openoffice.org-2-RC/files/patch-i64815
View File

File diff suppressed because it is too large Load Diff

11
editors/openoffice.org-2-RC/files/patch-i64906
View File

@ -1,11 +0,0 @@
--- sal/osl/unx/security.c~ Wed May 10 20:57:40 2006
+++ sal/osl/unx/security.c Wed May 10 22:35:43 2006
@@ -73,7 +73,7 @@
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#ifdef MACOSX
+#if defined (MACOSX) || defined (FREEBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
size_t n = 1024;
#else

2718
editors/openoffice.org-2-RC/files/patch-i65467
View File

File diff suppressed because it is too large Load Diff

33
editors/openoffice.org-2-RC/files/patch-i65468
View File

@ -1,33 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.9
diff -u -r1.9 epm-3.7.patch
--- epm/epm-3.7.patch 17 Feb 2006 16:16:42 -0000 1.9
+++ epm/epm-3.7.patch 15 May 2006 21:54:11 -0000
@@ -659,3 +659,25 @@
putc(*s, fp);
}
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Mon May 15 13:48:17 2006
+***************
+*** 348,355 ****
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...
+--- 348,356 ----
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tbz %s", name, directory))
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...

18
editors/openoffice.org-2-RC/files/patch-i65511
View File

@ -1,18 +0,0 @@
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig Wed Sep 7 15:31:11 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Thu May 25 14:20:37 2006
@@ -76,6 +76,7 @@
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif
@@ -90,6 +91,7 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

61
editors/openoffice.org-2-RC/files/patch-i65512
View File

@ -1,61 +0,0 @@
--- sal/osl/unx/socket.c.orig Thu Sep 8 11:01:17 2005
+++ sal/osl/unx/socket.c Fri May 5 19:14:17 2006
@@ -813,7 +813,7 @@
const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop)
{
-#ifdef LINUX
+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
struct hostent *__result; /* will be the same as result */
int __error;
__error = gethostbyname_r (name, result, buffer, buflen,
--- sal/osl/unx/system.c.orig Fri Apr 7 04:06:25 2006
+++ sal/osl/unx/system.c Fri May 5 19:18:51 2006
@@ -343,6 +343,8 @@
}
#endif /* defined SCO */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -433,6 +435,7 @@
return res;
}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#if defined(MACOSX)
/*
--- sal/osl/unx/system.h.orig Thu May 4 04:48:25 2006
+++ sal/osl/unx/system.h Wed May 24 16:06:13 2006
@@ -543,8 +543,10 @@
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#endif
#endif /* __OSL_SYSTEM_H__ */
--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006
+++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006
@@ -7697,3 +7697,15 @@
# Force applications to be built non-statically
# when building the mozcomps meta component
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004
++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006
+@@ -105,7 +105,8 @@
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
+
+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
++ (defined(__FreeBSD__) && __FreeBSD_version > 601103)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

591
editors/openoffice.org-2-RC/files/patch-i65513
View File

@ -1,591 +0,0 @@
--- config_office/set_soenv.in Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Tue May 23 14:31:50 2006
@@ -320,32 +320,60 @@
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
-{ print "Setting FreeBSD specific values... ";
- $outfile = "FreeBSDEnv.Set";
- $BIG_SVX = "TRUE";
+{ $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
- $CPU = "I";
- $CPUNAME = "INTEL";
$CVER = "C300";
$GUI = "UNX";
$GUIBASE = "unx";
$GUIENV = "sal";
$GVER = "VCL";
- $OUTPATH = "unxfbsd";
- $INPATH = $OUTPATH.$PROEXT;
- $GVERDIR = $INPATH;
$OS = "FREEBSD";
$PATH_SEPERATOR = $ps;
$XPVERSION = "3";
$OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^amd64/)
+ { my ( $JAVA_OS );
+ print "Setting FreeBSD AMD64 specific values... ";
+ $outfile = "FreeBSDAMDEnv.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxfbsdx";
+ $JAVA_OS = '@JAVA_HOME@';
+ $JAVA_OS =~ s/.*\///;
+ if ($JAVA_OS =~ m/^linux/)
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ }
+ else
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }
+ }
+ elsif ($platform =~ m/^i386/)
+ { print "Setting FreeBSD Intel specific values... ";
+ $outfile = "FreeBSDIntelEnv.Set";
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $OUTPATH = "unxfbsdi";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- if( @GCCVER@ >= 30401 ) {
- $CVER = "C341";
- }
+ }
+ else
+ { print "Unsupported FreeBSD architecture: $platform \n";
+ exit 1;
+ }
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
+ $INPATH = $OUTPATH.$PROEXT;
+ $GVERDIR = $INPATH;
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -963,8 +991,7 @@
$D.$OS.
$D.$CPUNAME;
if ($platform =~ m/freebsd/)
- { $SOLARDEF .= $D."X86".
- $D."OSVERSION=$OSVERSION".
+ { $SOLARDEF .= $D."OSVERSION=$OSVERSION".
" @PTHREAD_CFLAGS@";
}
$SOLARDEF .= $D."_REENTRANT".
@@ -1294,6 +1321,7 @@
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--- solenv/inc/unx.mk Fri May 19 13:55:04 2006
+++ solenv/inc/unx.mk Fri May 19 13:38:42 2006
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-.INCLUDE : unxfbsdi.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
--- solenv/inc/unxfbsd.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsd.mk Fri May 19 13:52:02 2006
@@ -0,0 +1,220 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+# Makefile for FreeBSD.
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
+
+# Include arch specific makefile.
+.IF "$(CPUNAME)" == "INTEL"
+.INCLUDE : unxfbsdi.mk
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+.INCLUDE : unxfbsdx.mk
+.ENDIF
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+PICSWITCH:=-fpic
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+# Enable all warnings
+CFLAGSWALL=-Wall
+# Set default warn level
+CFLAGSDFLTWARN=
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+STDLIBGUIST=-lX11 -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
--- solenv/inc/unxfbsdi.mk Tue Jan 31 13:24:38 2006
+++ solenv/inc/unxfbsdi.mk Fri May 19 13:52:19 2006
@@ -33,192 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
+#
+# FreBSD/i386 specific defines
+#
-SOLAR_JAVA*=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
+CDEFS+=-DX86
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=-mtune=pentiumpro
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
-CFLAGSOBJGUIST=
-# Compiler flags for compiling static object in single threaded environment with character user interface
-CFLAGSOBJCUIST=
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-CFLAGSOPT+=-Wuninitialized # not supported without optimization
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
+CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-# Enable all warnings
-CFLAGSWALL=-Wall
-# Set default warn level
-CFLAGSDFLTWARN=
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBCUIST=-lm
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-STDLIBGUIST=-lX11 -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-STDSHLGUIST=-lX11 -lXext -lm
-STDSHLCUIST=-lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
# platform specific identifier for shared libs
DLLPOSTFIX=fi
-DLLPRE=lib
-DLLPOST=.so
-
--- solenv/inc/unxfbsdx.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsdx.mk Fri May 19 13:52:38 2006
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+#
+# FreBSD/amd64 specific defines
+#
+
+CDEFS+=-DX86_64
+
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+.IF "$(CPUNAME)" == "X86_64"
+ARCH_FLAGS*=
+.ENDIF
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

140
editors/openoffice.org-2-RC/files/patch-i65514
View File

@ -1,140 +0,0 @@
--- berkeleydb/db-4.2.52.patch.orig Fri Dec 23 09:22:46 2005
+++ berkeleydb/db-4.2.52.patch Fri May 19 17:44:11 2006
@@ -205,6 +205,20 @@
! $(SLO)$/dbreg_util.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006
+***************
+*** 193,198 ****
+--- 193,201 ----
+ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
+ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
+
++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100
--- misc/build/db-4.2.52.NC/dist/configure 2005-12-22 18:36:14.647415000 +0100
***************
@@ -241,6 +255,76 @@
fi
# Commands to make compiler produce verbose output that lists
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
++ if test "$db_cv_mutex" = no; then
++ cat >conftest.$ac_ext <<_ACEOF
++ #line $LINENO "configure"
++ /* confdefs.h. */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h. */
++
++ int
++ main ()
++ {
++
++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
++ exit(0);
++ #else
++ FAIL TO COMPILE/LINK
++ #endif
++
++ ;
++ return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ db_cv_mutex="x86_64/gcc-assembly"
++ else
++ echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++
++ fi
++ rm -f conftest.$ac_objext conftest.$ac_ext
++ fi
++
+ # S390/cc: IBM OS/390 Unix
+ if test "$db_cv_mutex" = no; then
+ cat >conftest.$ac_ext <<_ACEOF
+***************
+*** 28971,28976 ****
+--- 29016,29028 ----
+ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
++ _ACEOF
++
++
++ ;;
++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++ cat >>confdefs.h <<\_ACEOF
++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
+ _ACEOF
+
+
*** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
--- misc/build/db-4.2.52.NC/dist/ltmain.sh 2005-12-22 18:36:14.447413000 +0100
***************
@@ -943,3 +1027,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003
+--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006
+***************
+*** 781,786 ****
+--- 781,811 ----
+ #endif
+ #endif
+
++ /*********************************************************************
++ * x86_64/gcc assembly.
++ *********************************************************************/
++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++ typedef unsigned char tsl_t;
++
++ #ifdef LOAD_ACTUAL_MUTEX_CODE
++ /*
++ * For gcc/x86-64, 0 is clear, 1 is set.
++ */
++ #define MUTEX_SET(tsl) ({ \
++ register tsl_t *__l = (tsl); \
++ int __r; \
++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
++ : "=&a" (__r), "=m" (*__l) \
++ : "1" (*__l) \
++ ); \
++ __r & 1; \
++ })
++
++ #define MUTEX_UNSET(tsl) (*(tsl) = 0)
++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
++ #endif
++ #endif
++
+ /*
+ * Mutex alignment defaults to one byte.
+ *

16
editors/openoffice.org-2-RC/files/patch-i66064
View File

@ -1,16 +0,0 @@
Index: unx/source/gdi/salprnpsp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
retrieving revision 1.40
diff -u -r1.40 salprnpsp.cxx
--- vcl/unx/source/gdi/salprnpsp.cxx 22 Mar 2006 09:46:43 -0000 1.40
+++ vcl/unx/source/gdi/salprnpsp.cxx 27 May 2006 00:31:26 -0000
@@ -101,6 +101,8 @@
// NETBSD has no RTLD_GLOBAL
#ifndef RTLD_GLOBAL
#define DLOPEN_MODE (RTLD_LAZY)
+#elif defined(FREEBSD)
+#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL)
#else
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
#endif

29
editors/openoffice.org-2-RC/files/patch-i66065
View File

@ -1,29 +0,0 @@
--- tools/inc/inetdef.hxx.orig Fri Sep 9 09:42:51 2005
+++ tools/inc/inetdef.hxx Thu May 25 18:31:02 2006
@@ -65,7 +65,9 @@
#elif defined LINUX && defined X86
#define TOOLS_INETDEF_OS "Linux"
#elif defined FREEBSD && defined X86
-#define TOOLS_INETDEF_OS "FreeBSD"
+#define TOOLS_INETDEF_OS "FreeBSD/i386"
+#elif defined FREEBSD && defined X86_64
+#define TOOLS_INETDEF_OS "FreeBSD/amd64"
#elif defined SINIX
#define TOOLS_INETDEF_OS "SINIX"
#elif defined IRIX
--- tools/inc/solar.h.orig Wed Apr 26 16:42:59 2006
+++ tools/inc/solar.h Thu May 25 18:37:19 2006
@@ -397,9 +397,12 @@
#elif defined LINUX && defined __x86_64__
#define __DLLEXTENSION "lx.so"
#define SYSTEM_ID SYSTEM_UNXLNXX
-#elif defined FREEBSD
+#elif defined FREEBSD && defined X86
#define __DLLEXTENSION "fi.so"
#define SYSTEM_ID SYSTEM_UNXFBSDI
+#elif defined FREEBSD && defined X86_64
+ #define __DLLEXTENSION "fx.so"
+ #define SYSTEM_ID SYSTEM_UNXFBSDX
#elif defined IRIX
#define __DLLEXTENSION "im.so"
#define SYSTEM_ID SYSTEM_UNXIRXM

516
editors/openoffice.org-2-RC/files/patch-i66666
View File

@ -19,519 +19,3 @@ diff -u -r1.44 solar.h
#undef _SOLAR__PRIVATE
#endif
Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.11
diff -u -r1.11 SalGtkFilePicker.cxx
--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11
+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -208,7 +208,7 @@
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL );
+ (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -347,7 +347,7 @@
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_pack_start (column, cell, FALSE);
- gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
}
@@ -377,7 +377,7 @@
PangoRectangle row_height;
pango_layout_set_markup (layout, "All Files", -1);
pango_layout_get_pixel_extents (layout, NULL, &row_height);
- g_object_get (cell, "ypad", &ypad, NULL);
+ g_object_get (cell, "ypad", &ypad, (void *)NULL);
guint height = (row_height.height + 2*ypad) * 5;
gtk_widget_set_size_request (m_pFilterView, -1, height);
gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -1414,7 +1414,7 @@
}
if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
g_object_set( pWidget, "label", aTxt.getStr(),
- "use_underline", TRUE, NULL );
+ "use_underline", TRUE, (void *)NULL );
else
OSL_TRACE("Can't set label on list\n");
}
Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
retrieving revision 1.6
diff -u -r1.6 SalGtkFolderPicker.cxx
--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 8 Sep 2005 23:35:19 -0000 1.6
+++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -125,7 +125,7 @@
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.27
diff -u -r1.27 salnativewidgets-gtk.cxx
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 11 May 2006 10:00:59 -0000 1.27
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 16 Jun 2006 00:59:16 -0000
@@ -550,7 +550,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
Rectangle aForward;
Rectangle aBackward;
@@ -910,7 +910,7 @@
gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
gtk_widget_style_get( pWidget,
"indicator_size", &indicator_size,
- NULL );
+ (void *)NULL );
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
(rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
@@ -928,7 +928,7 @@
gtk_widget_style_get( widget,
"indicator_size", &indicator_size,
"indicator_spacing", &indicator_spacing,
- NULL);
+ (void *)NULL);
indicator_size += 2*indicator_spacing; // guess overpaint of theme
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
@@ -978,7 +978,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1081,7 +1081,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1134,7 +1134,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1192,7 +1192,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1291,7 +1291,7 @@
"stepper_size", &stepper_size,
"trough_border", &trough_border,
"stepper_spacing", &stepper_spacing,
- "min_slider_length", &min_slider_length, NULL );
+ "min_slider_length", &min_slider_length, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
gboolean has_backward;
@@ -1300,7 +1300,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint magic = trough_border ? 1 : 0;
gint nFirst = 0;
@@ -1570,7 +1570,7 @@
gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
"stepper-size", &stepper_size,
"trough-border", &trough_border,
- "stepper-spacing", &stepper_spacing, NULL );
+ "stepper-spacing", &stepper_spacing, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
@@ -1580,7 +1580,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint buttonWidth;
gint buttonHeight;
Rectangle buttonRect;
@@ -1687,7 +1687,7 @@
// Grab some entry style attributes
gtk_widget_style_get( gEditBoxWidget, "focus-line-width", &focusWidth,
- "interior-focus", &interiorFocus, NULL );
+ "interior-focus", &interiorFocus, (void *)NULL );
if ( !interiorFocus )
{
@@ -1838,7 +1838,7 @@
}
NWSetWidgetState( gSpinButtonWidget, nState, stateType );
- gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
+ gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
if ( shadowType != GTK_SHADOW_NONE )
{
@@ -2048,7 +2048,7 @@
// Grab some button style attributes
gtk_widget_style_get( gDropdownWidget, "focus-line-width", &nFocusWidth,
- "focus-padding", &nFocusPad, NULL );
+ "focus-padding", &nFocusPad, (void *)NULL );
nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
nButtonWidth = nArrowWidth +
@@ -2272,7 +2272,7 @@
"interior_focus", &bInteriorFocus,
"focus_line_width", &nFocusLineWidth,
"focus_padding", &nFocusPadding,
- NULL);
+ (void *)NULL);
}
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -2482,7 +2482,7 @@
{
gtk_widget_style_get( gMenuItemMenubarWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
}
@@ -2571,7 +2571,7 @@
{
gtk_widget_style_get( gMenuItemMenuWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
NWSetWidgetState( gMenuWidget, nState, stateType );
@@ -2730,7 +2730,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
width = pIndicatorSize->width;
@@ -2791,7 +2791,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
{
@@ -3074,11 +3074,11 @@
GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
gboolean blink = false;
- g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
if( blink )
{
gint blink_time = STYLE_CURSOR_NOBLINKTIME;
- g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
// set the blink_time if there is a setting and it is reasonable
// else leave the default value
if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -3097,7 +3097,7 @@
"slider-width", &slider_width,
"trough-border", &trough_border,
"min-slider-length", &min_slider_length,
- NULL );
+ (void *)NULL );
gint magic = trough_border ? 1 : 0;
aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
aStyleSet.SetMinThumbSize( min_slider_length - magic );
@@ -3439,7 +3439,7 @@
gtk_widget_ensure_style( gToolbarWidget );
gtk_widget_style_get( gToolbarWidget,
"button_relief", &aRelief,
- NULL);
+ (void *)NULL);
gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
Index: vcl/unx/source/app/i18n_cb.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
retrieving revision 1.28
diff -u -r1.28 i18n_cb.cxx
--- vcl/unx/source/app/i18n_cb.cxx 19 Apr 2006 13:56:47 -0000 1.28
+++ vcl/unx/source/app/i18n_cb.cxx 16 Jun 2006 00:59:17 -0000
@@ -463,8 +463,8 @@
point.y = mPosEvent.mnY + mPosEvent.mnHeight;
XVaNestedList preedit_attr;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
- XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
+ XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
return;
@@ -600,7 +600,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( ic,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
Index: vcl/unx/source/app/i18n_ic.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_ic.cxx
--- vcl/unx/source/app/i18n_ic.cxx 16 Jan 2006 13:07:29 -0000 1.35
+++ vcl/unx/source/app/i18n_ic.cxx 16 Jun 2006 00:59:17 -0000
@@ -137,7 +137,7 @@
a_dstlist = XVaCreateNestedList(
0,
name, value,
- NULL );
+ (void *)NULL );
}
else
{
@@ -145,7 +145,7 @@
0,
XNVaNestedList, a_srclist,
name, value,
- NULL );
+ (void *)NULL );
}
return a_dstlist != NULL ? a_dstlist : a_srclist ;
@@ -263,7 +263,7 @@
XNStatusStartCallback, &aStatusStartCallback,
XNStatusDoneCallback, &aStatusDoneCallback,
XNStatusDrawCallback, &aStatusDrawCallback,
- NULL );
+ (void *)NULL );
break;
}
@@ -302,7 +302,7 @@
XNPreeditDoneCallback, &maPreeditDoneCallback,
XNPreeditDrawCallback, &maPreeditDrawCallback,
XNPreeditCaretCallback, &maPreeditCaretCallback,
- NULL );
+ (void *)NULL );
break;
@@ -324,7 +324,7 @@
mpPreeditAttributes = XVaCreateNestedList (
0,
XNSpotLocation, &aSpot,
- NULL );
+ (void *)NULL );
// XCreateIC() fails on Redflag Linux 2.0 if there is no
// fontset though the data itself is not evaluated nor is
@@ -357,7 +357,7 @@
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
XNInputStyle, mnPreeditStyle | mnStatusStyle,
- NULL );
+ (void *)NULL );
if ( mnPreeditStyle != XIMPreeditNone )
{
@@ -377,7 +377,7 @@
}
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
}
if ( maContext == NULL )
@@ -416,7 +416,7 @@
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if ( maContext != NULL)
{
@@ -424,7 +424,7 @@
maDestroyCallback.client_data = (XPointer)this;
XSetICValues( maContext,
XNDestroyCallback, &maDestroyCallback,
- NULL );
+ (void *)NULL );
}
if( mbMultiLingual )
@@ -433,7 +433,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( maContext,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
@@ -481,12 +481,12 @@
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
if ( maContext != NULL && mbMultiLingual )
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if( maClientData.pFrame != pFrame )
SetICFocus( pFrame );
@@ -529,7 +529,7 @@
&aWindowAttributes );
XGetICValues ( maContext,
XNFilterEvents, &nIMEventMask,
- NULL);
+ (void *)NULL);
nIMEventMask |= aWindowAttributes.your_event_mask;
XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
}
@@ -685,8 +685,8 @@
aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
- XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
I18NStatus::get().show( true, I18NStatus::contextmap );
@@ -717,7 +717,7 @@
XSetICValues( maContext,
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
- NULL );
+ (void *)NULL );
if( maClientData.aInputEv.mpTextAttr )
{
@@ -761,8 +761,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, &preedit_state,
- NULL);
- if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
+ (void *)NULL);
+ if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
{
XFree(preedit_attr);
@@ -770,8 +770,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, preedit_state,
- NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
}
XFree(preedit_attr);
Index: vcl/unx/source/app/i18n_im.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_im.cxx
--- vcl/unx/source/app/i18n_im.cxx 7 Apr 2006 08:04:45 -0000 1.35
+++ vcl/unx/source/app/i18n_im.cxx 16 Jun 2006 00:59:17 -0000
@@ -427,13 +427,13 @@
mbMultiLingual = False;
else
if ( XGetIMValues(maMethod,
- XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
+ XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
mbMultiLingual = False;
if( mbMultiLingual )
{
XIMUnicodeCharacterSubsets* subsets;
if( XGetIMValues( maMethod,
- XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
+ XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
@@ -473,7 +473,7 @@
if ( maMethod != (XIM)NULL )
{
- if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
+ if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
!= NULL)
mbUseable = False;
#if OSL_DEBUG_LEVEL > 1
@@ -496,7 +496,7 @@
maDestroyCallback.callback = (XIMProc)IM_IMDestroyCallback;
maDestroyCallback.client_data = (XPointer)this;
if (mbUseable && maMethod != NULL)
- XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
+ XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
return mbUseable;
}
Index: vcl/unx/source/app/i18n_status.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
retrieving revision 1.30
diff -u -r1.30 i18n_status.cxx
--- vcl/unx/source/app/i18n_status.cxx 16 Jan 2006 13:08:00 -0000 1.30
+++ vcl/unx/source/app/i18n_status.cxx 16 Jun 2006 00:59:17 -0000
@@ -502,7 +502,7 @@
XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
XNUnicodeCharacterSubset,
rChoices[nIndex].pData,
- NULL);
+ (void *)NULL);
// FIXME: get rid of X11SalFrame
X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
if( pParent && pParent->isMapped() )

20
editors/openoffice.org-2-RC/files/patch-i66667
View File

@ -1,10 +1,10 @@
Index: gtkinst.cxx
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
retrieving revision 1.13
diff -u -r1.13 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13
+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000
retrieving revision 1.14.88.1
diff -u -r1.14.88.1 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1
+++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000
@@ -43,6 +43,7 @@
#include <plugins/gtk/atkbridge.hxx>
@ -13,15 +13,14 @@ diff -u -r1.13 gtkinst.cxx
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -111,13 +112,28 @@
@@ -111,11 +112,26 @@
GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsLeave();
}
- static bool hookLocks( oslModule pModule )
+ static bool hookLocks( void )
{
- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ /* XXX GDK library path should be set by configure. */
@ -40,11 +39,8 @@ diff -u -r1.13 gtkinst.cxx
+ }
+
GdkLockFn gdk_threads_set_lock_functions =
- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
if ( !gdk_threads_set_lock_functions )
{
#if OSL_DEBUG_LEVEL > 1
@@ -150,7 +166,7 @@
if ( !g_thread_supported() )
g_thread_init( NULL );

27
editors/openoffice.org-2.0/Makefile
View File

@ -13,21 +13,25 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
#DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
DISTFILES+= OOo_2.0.1_src.tar.gz
DISTFILES+= unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
#EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
EXTRACT_ONLY= OOo_2.0.1_src.tar.gz
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
OOOVERSION= 2.0.3
OOOVERSION= 2.0.4.m1
NO_LATEST_LINK= yes
USE_GNOME= gtk20 gnomevfs2
MOZILLA_VERSION= 1.7.5
@ -71,7 +75,7 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
OOOTAG?= OOC680_m7
OOOTAG?= OOD680_m1
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
@ -153,11 +157,9 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
.if (${GCCVER} == 41)
@ -197,6 +199,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
@ -254,10 +257,10 @@ post-install:
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
.if defined(WITH_KDE)
@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applnk/${EXECBASE}
@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \

9
editors/openoffice.org-2.0/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = f68832ff3458664ae2b741ec67d30104
SHA256 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 31c82e971763827c5f55d036bbb4d6e7c7a732ca73e37ce56312b276d1a0a7b5
SIZE (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 307317482
MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 45545bcaa0733eefdce158010c42e638
SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = a3361d325c125e30f59b2cc502c3e7937cb902dcc9ec4efc7909049521554610
SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 319068872
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

54
editors/openoffice.org-2.0/files/patch-i64442
View File

@ -1,54 +0,0 @@
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000
@@ -63,13 +63,8 @@
char const* const* GnuInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#ifdef X86_64
- "/lib64/libgcj.so.7",
- "/lib64/libgcj.so.6"
-#else
- "/lib/libgcj.so.7",
- "/lib/libgcj.so.6"
-#endif
+ "/libgcj.so.7",
+ "/libgcj.so.6"
};
*size = sizeof(ar) / sizeof (char*);
return ar;
@@ -87,7 +82,7 @@
OUString sVersionProperty(
RTL_CONSTASCII_USTRINGPARAM("java.version"));
OUString sHomeProperty(
- RTL_CONSTASCII_USTRINGPARAM("java.home"));
+ RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
OUString sAccessProperty(
RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -111,19 +106,8 @@
}
else if (!bHome && sHomeProperty.equals(i->first))
{
- OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
- osl_File_E_None)
- {
- //make sure that the drive letter have all the same case
- //otherwise file:///c:/jre and file:///C:/jre produce two
- //different objects!!!
- if (makeDriveLetterSame( & fileURL))
- {
- m_sHome = fileURL;
- bHome = true;
- }
- }
+ m_sHome = i->second;
+ bHome = true;
}
else if (!bAccess && sAccessProperty.equals(i->first))
{

19
editors/openoffice.org-2.0/files/patch-i64762
View File

@ -1,19 +0,0 @@
Index: sal/osl/unx/security.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/security.c,v
retrieving revision 1.18
diff -u -r1.18 security.c
--- sal/osl/unx/security.c 20 Apr 2006 16:24:05 -0000 1.18
+++ sal/osl/unx/security.c 25 Apr 2006 21:35:23 -0000
@@ -57,6 +57,11 @@
#define PAM_BINARY_MSG 6
#endif
+#include <stdint.h> //C99 contains SIZE_MAX
+#ifndef SIZE_MAX
+#define SIZE_MAX (sizeof (size_t) -1)
+#endif
+
extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
static oslSecurityError SAL_CALL

4767
editors/openoffice.org-2.0/files/patch-i64815
View File

File diff suppressed because it is too large Load Diff

11
editors/openoffice.org-2.0/files/patch-i64906
View File

@ -1,11 +0,0 @@
--- sal/osl/unx/security.c~ Wed May 10 20:57:40 2006
+++ sal/osl/unx/security.c Wed May 10 22:35:43 2006
@@ -73,7 +73,7 @@
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#ifdef MACOSX
+#if defined (MACOSX) || defined (FREEBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
size_t n = 1024;
#else

2718
editors/openoffice.org-2.0/files/patch-i65467
View File

File diff suppressed because it is too large Load Diff

33
editors/openoffice.org-2.0/files/patch-i65468
View File

@ -1,33 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.9
diff -u -r1.9 epm-3.7.patch
--- epm/epm-3.7.patch 17 Feb 2006 16:16:42 -0000 1.9
+++ epm/epm-3.7.patch 15 May 2006 21:54:11 -0000
@@ -659,3 +659,25 @@
putc(*s, fp);
}
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Mon May 15 13:48:17 2006
+***************
+*** 348,355 ****
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...
+--- 348,356 ----
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tbz %s", name, directory))
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...

18
editors/openoffice.org-2.0/files/patch-i65511
View File

@ -1,18 +0,0 @@
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig Wed Sep 7 15:31:11 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Thu May 25 14:20:37 2006
@@ -76,6 +76,7 @@
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif
@@ -90,6 +91,7 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

61
editors/openoffice.org-2.0/files/patch-i65512
View File

@ -1,61 +0,0 @@
--- sal/osl/unx/socket.c.orig Thu Sep 8 11:01:17 2005
+++ sal/osl/unx/socket.c Fri May 5 19:14:17 2006
@@ -813,7 +813,7 @@
const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop)
{
-#ifdef LINUX
+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
struct hostent *__result; /* will be the same as result */
int __error;
__error = gethostbyname_r (name, result, buffer, buflen,
--- sal/osl/unx/system.c.orig Fri Apr 7 04:06:25 2006
+++ sal/osl/unx/system.c Fri May 5 19:18:51 2006
@@ -343,6 +343,8 @@
}
#endif /* defined SCO */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -433,6 +435,7 @@
return res;
}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#if defined(MACOSX)
/*
--- sal/osl/unx/system.h.orig Thu May 4 04:48:25 2006
+++ sal/osl/unx/system.h Wed May 24 16:06:13 2006
@@ -543,8 +543,10 @@
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#endif
#endif /* __OSL_SYSTEM_H__ */
--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006
+++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006
@@ -7697,3 +7697,15 @@
# Force applications to be built non-statically
# when building the mozcomps meta component
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004
++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006
+@@ -105,7 +105,8 @@
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
+
+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
++ (defined(__FreeBSD__) && __FreeBSD_version > 601103)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

591
editors/openoffice.org-2.0/files/patch-i65513
View File

@ -1,591 +0,0 @@
--- config_office/set_soenv.in Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Tue May 23 14:31:50 2006
@@ -320,32 +320,60 @@
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
-{ print "Setting FreeBSD specific values... ";
- $outfile = "FreeBSDEnv.Set";
- $BIG_SVX = "TRUE";
+{ $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
- $CPU = "I";
- $CPUNAME = "INTEL";
$CVER = "C300";
$GUI = "UNX";
$GUIBASE = "unx";
$GUIENV = "sal";
$GVER = "VCL";
- $OUTPATH = "unxfbsd";
- $INPATH = $OUTPATH.$PROEXT;
- $GVERDIR = $INPATH;
$OS = "FREEBSD";
$PATH_SEPERATOR = $ps;
$XPVERSION = "3";
$OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^amd64/)
+ { my ( $JAVA_OS );
+ print "Setting FreeBSD AMD64 specific values... ";
+ $outfile = "FreeBSDAMDEnv.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxfbsdx";
+ $JAVA_OS = '@JAVA_HOME@';
+ $JAVA_OS =~ s/.*\///;
+ if ($JAVA_OS =~ m/^linux/)
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ }
+ else
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }
+ }
+ elsif ($platform =~ m/^i386/)
+ { print "Setting FreeBSD Intel specific values... ";
+ $outfile = "FreeBSDIntelEnv.Set";
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $OUTPATH = "unxfbsdi";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- if( @GCCVER@ >= 30401 ) {
- $CVER = "C341";
- }
+ }
+ else
+ { print "Unsupported FreeBSD architecture: $platform \n";
+ exit 1;
+ }
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
+ $INPATH = $OUTPATH.$PROEXT;
+ $GVERDIR = $INPATH;
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -963,8 +991,7 @@
$D.$OS.
$D.$CPUNAME;
if ($platform =~ m/freebsd/)
- { $SOLARDEF .= $D."X86".
- $D."OSVERSION=$OSVERSION".
+ { $SOLARDEF .= $D."OSVERSION=$OSVERSION".
" @PTHREAD_CFLAGS@";
}
$SOLARDEF .= $D."_REENTRANT".
@@ -1294,6 +1321,7 @@
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--- solenv/inc/unx.mk Fri May 19 13:55:04 2006
+++ solenv/inc/unx.mk Fri May 19 13:38:42 2006
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-.INCLUDE : unxfbsdi.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
--- solenv/inc/unxfbsd.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsd.mk Fri May 19 13:52:02 2006
@@ -0,0 +1,220 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+# Makefile for FreeBSD.
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
+
+# Include arch specific makefile.
+.IF "$(CPUNAME)" == "INTEL"
+.INCLUDE : unxfbsdi.mk
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+.INCLUDE : unxfbsdx.mk
+.ENDIF
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+PICSWITCH:=-fpic
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+# Enable all warnings
+CFLAGSWALL=-Wall
+# Set default warn level
+CFLAGSDFLTWARN=
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+STDLIBGUIST=-lX11 -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
--- solenv/inc/unxfbsdi.mk Tue Jan 31 13:24:38 2006
+++ solenv/inc/unxfbsdi.mk Fri May 19 13:52:19 2006
@@ -33,192 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
+#
+# FreBSD/i386 specific defines
+#
-SOLAR_JAVA*=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
+CDEFS+=-DX86
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=-mtune=pentiumpro
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
-CFLAGSOBJGUIST=
-# Compiler flags for compiling static object in single threaded environment with character user interface
-CFLAGSOBJCUIST=
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-CFLAGSOPT+=-Wuninitialized # not supported without optimization
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
+CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-# Enable all warnings
-CFLAGSWALL=-Wall
-# Set default warn level
-CFLAGSDFLTWARN=
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBCUIST=-lm
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-STDLIBGUIST=-lX11 -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-STDSHLGUIST=-lX11 -lXext -lm
-STDSHLCUIST=-lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
# platform specific identifier for shared libs
DLLPOSTFIX=fi
-DLLPRE=lib
-DLLPOST=.so
-
--- solenv/inc/unxfbsdx.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsdx.mk Fri May 19 13:52:38 2006
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+#
+# FreBSD/amd64 specific defines
+#
+
+CDEFS+=-DX86_64
+
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+.IF "$(CPUNAME)" == "X86_64"
+ARCH_FLAGS*=
+.ENDIF
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

140
editors/openoffice.org-2.0/files/patch-i65514
View File

@ -1,140 +0,0 @@
--- berkeleydb/db-4.2.52.patch.orig Fri Dec 23 09:22:46 2005
+++ berkeleydb/db-4.2.52.patch Fri May 19 17:44:11 2006
@@ -205,6 +205,20 @@
! $(SLO)$/dbreg_util.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006
+***************
+*** 193,198 ****
+--- 193,201 ----
+ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
+ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
+
++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100
--- misc/build/db-4.2.52.NC/dist/configure 2005-12-22 18:36:14.647415000 +0100
***************
@@ -241,6 +255,76 @@
fi
# Commands to make compiler produce verbose output that lists
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
++ if test "$db_cv_mutex" = no; then
++ cat >conftest.$ac_ext <<_ACEOF
++ #line $LINENO "configure"
++ /* confdefs.h. */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h. */
++
++ int
++ main ()
++ {
++
++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
++ exit(0);
++ #else
++ FAIL TO COMPILE/LINK
++ #endif
++
++ ;
++ return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ db_cv_mutex="x86_64/gcc-assembly"
++ else
++ echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++
++ fi
++ rm -f conftest.$ac_objext conftest.$ac_ext
++ fi
++
+ # S390/cc: IBM OS/390 Unix
+ if test "$db_cv_mutex" = no; then
+ cat >conftest.$ac_ext <<_ACEOF
+***************
+*** 28971,28976 ****
+--- 29016,29028 ----
+ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
++ _ACEOF
++
++
++ ;;
++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++ cat >>confdefs.h <<\_ACEOF
++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
+ _ACEOF
+
+
*** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
--- misc/build/db-4.2.52.NC/dist/ltmain.sh 2005-12-22 18:36:14.447413000 +0100
***************
@@ -943,3 +1027,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003
+--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006
+***************
+*** 781,786 ****
+--- 781,811 ----
+ #endif
+ #endif
+
++ /*********************************************************************
++ * x86_64/gcc assembly.
++ *********************************************************************/
++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++ typedef unsigned char tsl_t;
++
++ #ifdef LOAD_ACTUAL_MUTEX_CODE
++ /*
++ * For gcc/x86-64, 0 is clear, 1 is set.
++ */
++ #define MUTEX_SET(tsl) ({ \
++ register tsl_t *__l = (tsl); \
++ int __r; \
++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
++ : "=&a" (__r), "=m" (*__l) \
++ : "1" (*__l) \
++ ); \
++ __r & 1; \
++ })
++
++ #define MUTEX_UNSET(tsl) (*(tsl) = 0)
++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
++ #endif
++ #endif
++
+ /*
+ * Mutex alignment defaults to one byte.
+ *

16
editors/openoffice.org-2.0/files/patch-i66064
View File

@ -1,16 +0,0 @@
Index: unx/source/gdi/salprnpsp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
retrieving revision 1.40
diff -u -r1.40 salprnpsp.cxx
--- vcl/unx/source/gdi/salprnpsp.cxx 22 Mar 2006 09:46:43 -0000 1.40
+++ vcl/unx/source/gdi/salprnpsp.cxx 27 May 2006 00:31:26 -0000
@@ -101,6 +101,8 @@
// NETBSD has no RTLD_GLOBAL
#ifndef RTLD_GLOBAL
#define DLOPEN_MODE (RTLD_LAZY)
+#elif defined(FREEBSD)
+#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL)
#else
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
#endif

29
editors/openoffice.org-2.0/files/patch-i66065
View File

@ -1,29 +0,0 @@
--- tools/inc/inetdef.hxx.orig Fri Sep 9 09:42:51 2005
+++ tools/inc/inetdef.hxx Thu May 25 18:31:02 2006
@@ -65,7 +65,9 @@
#elif defined LINUX && defined X86
#define TOOLS_INETDEF_OS "Linux"
#elif defined FREEBSD && defined X86
-#define TOOLS_INETDEF_OS "FreeBSD"
+#define TOOLS_INETDEF_OS "FreeBSD/i386"
+#elif defined FREEBSD && defined X86_64
+#define TOOLS_INETDEF_OS "FreeBSD/amd64"
#elif defined SINIX
#define TOOLS_INETDEF_OS "SINIX"
#elif defined IRIX
--- tools/inc/solar.h.orig Wed Apr 26 16:42:59 2006
+++ tools/inc/solar.h Thu May 25 18:37:19 2006
@@ -397,9 +397,12 @@
#elif defined LINUX && defined __x86_64__
#define __DLLEXTENSION "lx.so"
#define SYSTEM_ID SYSTEM_UNXLNXX
-#elif defined FREEBSD
+#elif defined FREEBSD && defined X86
#define __DLLEXTENSION "fi.so"
#define SYSTEM_ID SYSTEM_UNXFBSDI
+#elif defined FREEBSD && defined X86_64
+ #define __DLLEXTENSION "fx.so"
+ #define SYSTEM_ID SYSTEM_UNXFBSDX
#elif defined IRIX
#define __DLLEXTENSION "im.so"
#define SYSTEM_ID SYSTEM_UNXIRXM

516
editors/openoffice.org-2.0/files/patch-i66666
View File

@ -19,519 +19,3 @@ diff -u -r1.44 solar.h
#undef _SOLAR__PRIVATE
#endif
Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.11
diff -u -r1.11 SalGtkFilePicker.cxx
--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11
+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -208,7 +208,7 @@
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL );
+ (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -347,7 +347,7 @@
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_pack_start (column, cell, FALSE);
- gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
}
@@ -377,7 +377,7 @@
PangoRectangle row_height;
pango_layout_set_markup (layout, "All Files", -1);
pango_layout_get_pixel_extents (layout, NULL, &row_height);
- g_object_get (cell, "ypad", &ypad, NULL);
+ g_object_get (cell, "ypad", &ypad, (void *)NULL);
guint height = (row_height.height + 2*ypad) * 5;
gtk_widget_set_size_request (m_pFilterView, -1, height);
gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -1414,7 +1414,7 @@
}
if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
g_object_set( pWidget, "label", aTxt.getStr(),
- "use_underline", TRUE, NULL );
+ "use_underline", TRUE, (void *)NULL );
else
OSL_TRACE("Can't set label on list\n");
}
Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
retrieving revision 1.6
diff -u -r1.6 SalGtkFolderPicker.cxx
--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 8 Sep 2005 23:35:19 -0000 1.6
+++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -125,7 +125,7 @@
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.27
diff -u -r1.27 salnativewidgets-gtk.cxx
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 11 May 2006 10:00:59 -0000 1.27
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 16 Jun 2006 00:59:16 -0000
@@ -550,7 +550,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
Rectangle aForward;
Rectangle aBackward;
@@ -910,7 +910,7 @@
gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
gtk_widget_style_get( pWidget,
"indicator_size", &indicator_size,
- NULL );
+ (void *)NULL );
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
(rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
@@ -928,7 +928,7 @@
gtk_widget_style_get( widget,
"indicator_size", &indicator_size,
"indicator_spacing", &indicator_spacing,
- NULL);
+ (void *)NULL);
indicator_size += 2*indicator_spacing; // guess overpaint of theme
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
@@ -978,7 +978,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1081,7 +1081,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1134,7 +1134,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1192,7 +1192,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1291,7 +1291,7 @@
"stepper_size", &stepper_size,
"trough_border", &trough_border,
"stepper_spacing", &stepper_spacing,
- "min_slider_length", &min_slider_length, NULL );
+ "min_slider_length", &min_slider_length, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
gboolean has_backward;
@@ -1300,7 +1300,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint magic = trough_border ? 1 : 0;
gint nFirst = 0;
@@ -1570,7 +1570,7 @@
gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
"stepper-size", &stepper_size,
"trough-border", &trough_border,
- "stepper-spacing", &stepper_spacing, NULL );
+ "stepper-spacing", &stepper_spacing, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
@@ -1580,7 +1580,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint buttonWidth;
gint buttonHeight;
Rectangle buttonRect;
@@ -1687,7 +1687,7 @@
// Grab some entry style attributes
gtk_widget_style_get( gEditBoxWidget, "focus-line-width", &focusWidth,
- "interior-focus", &interiorFocus, NULL );
+ "interior-focus", &interiorFocus, (void *)NULL );
if ( !interiorFocus )
{
@@ -1838,7 +1838,7 @@
}
NWSetWidgetState( gSpinButtonWidget, nState, stateType );
- gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
+ gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
if ( shadowType != GTK_SHADOW_NONE )
{
@@ -2048,7 +2048,7 @@
// Grab some button style attributes
gtk_widget_style_get( gDropdownWidget, "focus-line-width", &nFocusWidth,
- "focus-padding", &nFocusPad, NULL );
+ "focus-padding", &nFocusPad, (void *)NULL );
nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
nButtonWidth = nArrowWidth +
@@ -2272,7 +2272,7 @@
"interior_focus", &bInteriorFocus,
"focus_line_width", &nFocusLineWidth,
"focus_padding", &nFocusPadding,
- NULL);
+ (void *)NULL);
}
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -2482,7 +2482,7 @@
{
gtk_widget_style_get( gMenuItemMenubarWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
}
@@ -2571,7 +2571,7 @@
{
gtk_widget_style_get( gMenuItemMenuWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
NWSetWidgetState( gMenuWidget, nState, stateType );
@@ -2730,7 +2730,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
width = pIndicatorSize->width;
@@ -2791,7 +2791,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
{
@@ -3074,11 +3074,11 @@
GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
gboolean blink = false;
- g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
if( blink )
{
gint blink_time = STYLE_CURSOR_NOBLINKTIME;
- g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
// set the blink_time if there is a setting and it is reasonable
// else leave the default value
if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -3097,7 +3097,7 @@
"slider-width", &slider_width,
"trough-border", &trough_border,
"min-slider-length", &min_slider_length,
- NULL );
+ (void *)NULL );
gint magic = trough_border ? 1 : 0;
aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
aStyleSet.SetMinThumbSize( min_slider_length - magic );
@@ -3439,7 +3439,7 @@
gtk_widget_ensure_style( gToolbarWidget );
gtk_widget_style_get( gToolbarWidget,
"button_relief", &aRelief,
- NULL);
+ (void *)NULL);
gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
Index: vcl/unx/source/app/i18n_cb.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
retrieving revision 1.28
diff -u -r1.28 i18n_cb.cxx
--- vcl/unx/source/app/i18n_cb.cxx 19 Apr 2006 13:56:47 -0000 1.28
+++ vcl/unx/source/app/i18n_cb.cxx 16 Jun 2006 00:59:17 -0000
@@ -463,8 +463,8 @@
point.y = mPosEvent.mnY + mPosEvent.mnHeight;
XVaNestedList preedit_attr;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
- XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
+ XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
return;
@@ -600,7 +600,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( ic,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
Index: vcl/unx/source/app/i18n_ic.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_ic.cxx
--- vcl/unx/source/app/i18n_ic.cxx 16 Jan 2006 13:07:29 -0000 1.35
+++ vcl/unx/source/app/i18n_ic.cxx 16 Jun 2006 00:59:17 -0000
@@ -137,7 +137,7 @@
a_dstlist = XVaCreateNestedList(
0,
name, value,
- NULL );
+ (void *)NULL );
}
else
{
@@ -145,7 +145,7 @@
0,
XNVaNestedList, a_srclist,
name, value,
- NULL );
+ (void *)NULL );
}
return a_dstlist != NULL ? a_dstlist : a_srclist ;
@@ -263,7 +263,7 @@
XNStatusStartCallback, &aStatusStartCallback,
XNStatusDoneCallback, &aStatusDoneCallback,
XNStatusDrawCallback, &aStatusDrawCallback,
- NULL );
+ (void *)NULL );
break;
}
@@ -302,7 +302,7 @@
XNPreeditDoneCallback, &maPreeditDoneCallback,
XNPreeditDrawCallback, &maPreeditDrawCallback,
XNPreeditCaretCallback, &maPreeditCaretCallback,
- NULL );
+ (void *)NULL );
break;
@@ -324,7 +324,7 @@
mpPreeditAttributes = XVaCreateNestedList (
0,
XNSpotLocation, &aSpot,
- NULL );
+ (void *)NULL );
// XCreateIC() fails on Redflag Linux 2.0 if there is no
// fontset though the data itself is not evaluated nor is
@@ -357,7 +357,7 @@
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
XNInputStyle, mnPreeditStyle | mnStatusStyle,
- NULL );
+ (void *)NULL );
if ( mnPreeditStyle != XIMPreeditNone )
{
@@ -377,7 +377,7 @@
}
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
}
if ( maContext == NULL )
@@ -416,7 +416,7 @@
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if ( maContext != NULL)
{
@@ -424,7 +424,7 @@
maDestroyCallback.client_data = (XPointer)this;
XSetICValues( maContext,
XNDestroyCallback, &maDestroyCallback,
- NULL );
+ (void *)NULL );
}
if( mbMultiLingual )
@@ -433,7 +433,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( maContext,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
@@ -481,12 +481,12 @@
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
if ( maContext != NULL && mbMultiLingual )
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if( maClientData.pFrame != pFrame )
SetICFocus( pFrame );
@@ -529,7 +529,7 @@
&aWindowAttributes );
XGetICValues ( maContext,
XNFilterEvents, &nIMEventMask,
- NULL);
+ (void *)NULL);
nIMEventMask |= aWindowAttributes.your_event_mask;
XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
}
@@ -685,8 +685,8 @@
aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
- XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
I18NStatus::get().show( true, I18NStatus::contextmap );
@@ -717,7 +717,7 @@
XSetICValues( maContext,
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
- NULL );
+ (void *)NULL );
if( maClientData.aInputEv.mpTextAttr )
{
@@ -761,8 +761,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, &preedit_state,
- NULL);
- if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
+ (void *)NULL);
+ if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
{
XFree(preedit_attr);
@@ -770,8 +770,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, preedit_state,
- NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
}
XFree(preedit_attr);
Index: vcl/unx/source/app/i18n_im.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_im.cxx
--- vcl/unx/source/app/i18n_im.cxx 7 Apr 2006 08:04:45 -0000 1.35
+++ vcl/unx/source/app/i18n_im.cxx 16 Jun 2006 00:59:17 -0000
@@ -427,13 +427,13 @@
mbMultiLingual = False;
else
if ( XGetIMValues(maMethod,
- XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
+ XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
mbMultiLingual = False;
if( mbMultiLingual )
{
XIMUnicodeCharacterSubsets* subsets;
if( XGetIMValues( maMethod,
- XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
+ XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
@@ -473,7 +473,7 @@
if ( maMethod != (XIM)NULL )
{
- if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
+ if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
!= NULL)
mbUseable = False;
#if OSL_DEBUG_LEVEL > 1
@@ -496,7 +496,7 @@
maDestroyCallback.callback = (XIMProc)IM_IMDestroyCallback;
maDestroyCallback.client_data = (XPointer)this;
if (mbUseable && maMethod != NULL)
- XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
+ XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
return mbUseable;
}
Index: vcl/unx/source/app/i18n_status.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
retrieving revision 1.30
diff -u -r1.30 i18n_status.cxx
--- vcl/unx/source/app/i18n_status.cxx 16 Jan 2006 13:08:00 -0000 1.30
+++ vcl/unx/source/app/i18n_status.cxx 16 Jun 2006 00:59:17 -0000
@@ -502,7 +502,7 @@
XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
XNUnicodeCharacterSubset,
rChoices[nIndex].pData,
- NULL);
+ (void *)NULL);
// FIXME: get rid of X11SalFrame
X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
if( pParent && pParent->isMapped() )

20
editors/openoffice.org-2.0/files/patch-i66667
View File

@ -1,10 +1,10 @@
Index: gtkinst.cxx
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
retrieving revision 1.13
diff -u -r1.13 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13
+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000
retrieving revision 1.14.88.1
diff -u -r1.14.88.1 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1
+++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000
@@ -43,6 +43,7 @@
#include <plugins/gtk/atkbridge.hxx>
@ -13,15 +13,14 @@ diff -u -r1.13 gtkinst.cxx
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -111,13 +112,28 @@
@@ -111,11 +112,26 @@
GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsLeave();
}
- static bool hookLocks( oslModule pModule )
+ static bool hookLocks( void )
{
- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ /* XXX GDK library path should be set by configure. */
@ -40,11 +39,8 @@ diff -u -r1.13 gtkinst.cxx
+ }
+
GdkLockFn gdk_threads_set_lock_functions =
- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
if ( !gdk_threads_set_lock_functions )
{
#if OSL_DEBUG_LEVEL > 1
@@ -150,7 +166,7 @@
if ( !g_thread_supported() )
g_thread_init( NULL );

27
editors/openoffice.org-2/Makefile
View File

@ -13,21 +13,25 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
#DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
DISTFILES+= OOo_2.0.1_src.tar.gz
DISTFILES+= unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
#EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
EXTRACT_ONLY= OOo_2.0.1_src.tar.gz
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
OOOVERSION= 2.0.3
OOOVERSION= 2.0.4.m1
NO_LATEST_LINK= yes
USE_GNOME= gtk20 gnomevfs2
MOZILLA_VERSION= 1.7.5
@ -71,7 +75,7 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
OOOTAG?= OOC680_m7
OOOTAG?= OOD680_m1
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
@ -153,11 +157,9 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
.if (${GCCVER} == 41)
@ -197,6 +199,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
@ -254,10 +257,10 @@ post-install:
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
.if defined(WITH_KDE)
@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applnk/${EXECBASE}
@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \

9
editors/openoffice.org-2/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = f68832ff3458664ae2b741ec67d30104
SHA256 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 31c82e971763827c5f55d036bbb4d6e7c7a732ca73e37ce56312b276d1a0a7b5
SIZE (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 307317482
MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 45545bcaa0733eefdce158010c42e638
SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = a3361d325c125e30f59b2cc502c3e7937cb902dcc9ec4efc7909049521554610
SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 319068872
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

54
editors/openoffice.org-2/files/patch-i64442
View File

@ -1,54 +0,0 @@
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000
@@ -63,13 +63,8 @@
char const* const* GnuInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#ifdef X86_64
- "/lib64/libgcj.so.7",
- "/lib64/libgcj.so.6"
-#else
- "/lib/libgcj.so.7",
- "/lib/libgcj.so.6"
-#endif
+ "/libgcj.so.7",
+ "/libgcj.so.6"
};
*size = sizeof(ar) / sizeof (char*);
return ar;
@@ -87,7 +82,7 @@
OUString sVersionProperty(
RTL_CONSTASCII_USTRINGPARAM("java.version"));
OUString sHomeProperty(
- RTL_CONSTASCII_USTRINGPARAM("java.home"));
+ RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
OUString sAccessProperty(
RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -111,19 +106,8 @@
}
else if (!bHome && sHomeProperty.equals(i->first))
{
- OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
- osl_File_E_None)
- {
- //make sure that the drive letter have all the same case
- //otherwise file:///c:/jre and file:///C:/jre produce two
- //different objects!!!
- if (makeDriveLetterSame( & fileURL))
- {
- m_sHome = fileURL;
- bHome = true;
- }
- }
+ m_sHome = i->second;
+ bHome = true;
}
else if (!bAccess && sAccessProperty.equals(i->first))
{

19
editors/openoffice.org-2/files/patch-i64762
View File

@ -1,19 +0,0 @@
Index: sal/osl/unx/security.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/security.c,v
retrieving revision 1.18
diff -u -r1.18 security.c
--- sal/osl/unx/security.c 20 Apr 2006 16:24:05 -0000 1.18
+++ sal/osl/unx/security.c 25 Apr 2006 21:35:23 -0000
@@ -57,6 +57,11 @@
#define PAM_BINARY_MSG 6
#endif
+#include <stdint.h> //C99 contains SIZE_MAX
+#ifndef SIZE_MAX
+#define SIZE_MAX (sizeof (size_t) -1)
+#endif
+
extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
static oslSecurityError SAL_CALL

4767
editors/openoffice.org-2/files/patch-i64815
View File

File diff suppressed because it is too large Load Diff

11
editors/openoffice.org-2/files/patch-i64906
View File

@ -1,11 +0,0 @@
--- sal/osl/unx/security.c~ Wed May 10 20:57:40 2006
+++ sal/osl/unx/security.c Wed May 10 22:35:43 2006
@@ -73,7 +73,7 @@
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#ifdef MACOSX
+#if defined (MACOSX) || defined (FREEBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
size_t n = 1024;
#else

2718
editors/openoffice.org-2/files/patch-i65467
View File

File diff suppressed because it is too large Load Diff

33
editors/openoffice.org-2/files/patch-i65468
View File

@ -1,33 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.9
diff -u -r1.9 epm-3.7.patch
--- epm/epm-3.7.patch 17 Feb 2006 16:16:42 -0000 1.9
+++ epm/epm-3.7.patch 15 May 2006 21:54:11 -0000
@@ -659,3 +659,25 @@
putc(*s, fp);
}
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Mon May 15 13:48:17 2006
+***************
+*** 348,355 ****
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...
+--- 348,356 ----
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tbz %s", name, directory))
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...

18
editors/openoffice.org-2/files/patch-i65511
View File

@ -1,18 +0,0 @@
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig Wed Sep 7 15:31:11 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Thu May 25 14:20:37 2006
@@ -76,6 +76,7 @@
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif
@@ -90,6 +91,7 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

61
editors/openoffice.org-2/files/patch-i65512
View File

@ -1,61 +0,0 @@
--- sal/osl/unx/socket.c.orig Thu Sep 8 11:01:17 2005
+++ sal/osl/unx/socket.c Fri May 5 19:14:17 2006
@@ -813,7 +813,7 @@
const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop)
{
-#ifdef LINUX
+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
struct hostent *__result; /* will be the same as result */
int __error;
__error = gethostbyname_r (name, result, buffer, buflen,
--- sal/osl/unx/system.c.orig Fri Apr 7 04:06:25 2006
+++ sal/osl/unx/system.c Fri May 5 19:18:51 2006
@@ -343,6 +343,8 @@
}
#endif /* defined SCO */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -433,6 +435,7 @@
return res;
}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#if defined(MACOSX)
/*
--- sal/osl/unx/system.h.orig Thu May 4 04:48:25 2006
+++ sal/osl/unx/system.h Wed May 24 16:06:13 2006
@@ -543,8 +543,10 @@
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#endif
#endif /* __OSL_SYSTEM_H__ */
--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006
+++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006
@@ -7697,3 +7697,15 @@
# Force applications to be built non-statically
# when building the mozcomps meta component
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004
++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006
+@@ -105,7 +105,8 @@
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
+
+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
++ (defined(__FreeBSD__) && __FreeBSD_version > 601103)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

591
editors/openoffice.org-2/files/patch-i65513
View File

@ -1,591 +0,0 @@
--- config_office/set_soenv.in Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Tue May 23 14:31:50 2006
@@ -320,32 +320,60 @@
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
-{ print "Setting FreeBSD specific values... ";
- $outfile = "FreeBSDEnv.Set";
- $BIG_SVX = "TRUE";
+{ $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
- $CPU = "I";
- $CPUNAME = "INTEL";
$CVER = "C300";
$GUI = "UNX";
$GUIBASE = "unx";
$GUIENV = "sal";
$GVER = "VCL";
- $OUTPATH = "unxfbsd";
- $INPATH = $OUTPATH.$PROEXT;
- $GVERDIR = $INPATH;
$OS = "FREEBSD";
$PATH_SEPERATOR = $ps;
$XPVERSION = "3";
$OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^amd64/)
+ { my ( $JAVA_OS );
+ print "Setting FreeBSD AMD64 specific values... ";
+ $outfile = "FreeBSDAMDEnv.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxfbsdx";
+ $JAVA_OS = '@JAVA_HOME@';
+ $JAVA_OS =~ s/.*\///;
+ if ($JAVA_OS =~ m/^linux/)
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ }
+ else
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }
+ }
+ elsif ($platform =~ m/^i386/)
+ { print "Setting FreeBSD Intel specific values... ";
+ $outfile = "FreeBSDIntelEnv.Set";
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $OUTPATH = "unxfbsdi";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- if( @GCCVER@ >= 30401 ) {
- $CVER = "C341";
- }
+ }
+ else
+ { print "Unsupported FreeBSD architecture: $platform \n";
+ exit 1;
+ }
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
+ $INPATH = $OUTPATH.$PROEXT;
+ $GVERDIR = $INPATH;
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -963,8 +991,7 @@
$D.$OS.
$D.$CPUNAME;
if ($platform =~ m/freebsd/)
- { $SOLARDEF .= $D."X86".
- $D."OSVERSION=$OSVERSION".
+ { $SOLARDEF .= $D."OSVERSION=$OSVERSION".
" @PTHREAD_CFLAGS@";
}
$SOLARDEF .= $D."_REENTRANT".
@@ -1294,6 +1321,7 @@
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--- solenv/inc/unx.mk Fri May 19 13:55:04 2006
+++ solenv/inc/unx.mk Fri May 19 13:38:42 2006
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-.INCLUDE : unxfbsdi.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
--- solenv/inc/unxfbsd.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsd.mk Fri May 19 13:52:02 2006
@@ -0,0 +1,220 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+# Makefile for FreeBSD.
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
+
+# Include arch specific makefile.
+.IF "$(CPUNAME)" == "INTEL"
+.INCLUDE : unxfbsdi.mk
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+.INCLUDE : unxfbsdx.mk
+.ENDIF
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+PICSWITCH:=-fpic
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+# Enable all warnings
+CFLAGSWALL=-Wall
+# Set default warn level
+CFLAGSDFLTWARN=
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+STDLIBGUIST=-lX11 -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
--- solenv/inc/unxfbsdi.mk Tue Jan 31 13:24:38 2006
+++ solenv/inc/unxfbsdi.mk Fri May 19 13:52:19 2006
@@ -33,192 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
+#
+# FreBSD/i386 specific defines
+#
-SOLAR_JAVA*=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
+CDEFS+=-DX86
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=-mtune=pentiumpro
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
-CFLAGSOBJGUIST=
-# Compiler flags for compiling static object in single threaded environment with character user interface
-CFLAGSOBJCUIST=
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-CFLAGSOPT+=-Wuninitialized # not supported without optimization
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
+CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-# Enable all warnings
-CFLAGSWALL=-Wall
-# Set default warn level
-CFLAGSDFLTWARN=
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBCUIST=-lm
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-STDLIBGUIST=-lX11 -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-STDSHLGUIST=-lX11 -lXext -lm
-STDSHLCUIST=-lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
# platform specific identifier for shared libs
DLLPOSTFIX=fi
-DLLPRE=lib
-DLLPOST=.so
-
--- solenv/inc/unxfbsdx.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsdx.mk Fri May 19 13:52:38 2006
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+#
+# FreBSD/amd64 specific defines
+#
+
+CDEFS+=-DX86_64
+
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+.IF "$(CPUNAME)" == "X86_64"
+ARCH_FLAGS*=
+.ENDIF
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

140
editors/openoffice.org-2/files/patch-i65514
View File

@ -1,140 +0,0 @@
--- berkeleydb/db-4.2.52.patch.orig Fri Dec 23 09:22:46 2005
+++ berkeleydb/db-4.2.52.patch Fri May 19 17:44:11 2006
@@ -205,6 +205,20 @@
! $(SLO)$/dbreg_util.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006
+***************
+*** 193,198 ****
+--- 193,201 ----
+ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
+ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
+
++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100
--- misc/build/db-4.2.52.NC/dist/configure 2005-12-22 18:36:14.647415000 +0100
***************
@@ -241,6 +255,76 @@
fi
# Commands to make compiler produce verbose output that lists
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
++ if test "$db_cv_mutex" = no; then
++ cat >conftest.$ac_ext <<_ACEOF
++ #line $LINENO "configure"
++ /* confdefs.h. */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h. */
++
++ int
++ main ()
++ {
++
++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
++ exit(0);
++ #else
++ FAIL TO COMPILE/LINK
++ #endif
++
++ ;
++ return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ db_cv_mutex="x86_64/gcc-assembly"
++ else
++ echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++
++ fi
++ rm -f conftest.$ac_objext conftest.$ac_ext
++ fi
++
+ # S390/cc: IBM OS/390 Unix
+ if test "$db_cv_mutex" = no; then
+ cat >conftest.$ac_ext <<_ACEOF
+***************
+*** 28971,28976 ****
+--- 29016,29028 ----
+ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
++ _ACEOF
++
++
++ ;;
++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++ cat >>confdefs.h <<\_ACEOF
++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
+ _ACEOF
+
+
*** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
--- misc/build/db-4.2.52.NC/dist/ltmain.sh 2005-12-22 18:36:14.447413000 +0100
***************
@@ -943,3 +1027,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003
+--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006
+***************
+*** 781,786 ****
+--- 781,811 ----
+ #endif
+ #endif
+
++ /*********************************************************************
++ * x86_64/gcc assembly.
++ *********************************************************************/
++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++ typedef unsigned char tsl_t;
++
++ #ifdef LOAD_ACTUAL_MUTEX_CODE
++ /*
++ * For gcc/x86-64, 0 is clear, 1 is set.
++ */
++ #define MUTEX_SET(tsl) ({ \
++ register tsl_t *__l = (tsl); \
++ int __r; \
++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
++ : "=&a" (__r), "=m" (*__l) \
++ : "1" (*__l) \
++ ); \
++ __r & 1; \
++ })
++
++ #define MUTEX_UNSET(tsl) (*(tsl) = 0)
++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
++ #endif
++ #endif
++
+ /*
+ * Mutex alignment defaults to one byte.
+ *

16
editors/openoffice.org-2/files/patch-i66064
View File

@ -1,16 +0,0 @@
Index: unx/source/gdi/salprnpsp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
retrieving revision 1.40
diff -u -r1.40 salprnpsp.cxx
--- vcl/unx/source/gdi/salprnpsp.cxx 22 Mar 2006 09:46:43 -0000 1.40
+++ vcl/unx/source/gdi/salprnpsp.cxx 27 May 2006 00:31:26 -0000
@@ -101,6 +101,8 @@
// NETBSD has no RTLD_GLOBAL
#ifndef RTLD_GLOBAL
#define DLOPEN_MODE (RTLD_LAZY)
+#elif defined(FREEBSD)
+#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL)
#else
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
#endif

29
editors/openoffice.org-2/files/patch-i66065
View File

@ -1,29 +0,0 @@
--- tools/inc/inetdef.hxx.orig Fri Sep 9 09:42:51 2005
+++ tools/inc/inetdef.hxx Thu May 25 18:31:02 2006
@@ -65,7 +65,9 @@
#elif defined LINUX && defined X86
#define TOOLS_INETDEF_OS "Linux"
#elif defined FREEBSD && defined X86
-#define TOOLS_INETDEF_OS "FreeBSD"
+#define TOOLS_INETDEF_OS "FreeBSD/i386"
+#elif defined FREEBSD && defined X86_64
+#define TOOLS_INETDEF_OS "FreeBSD/amd64"
#elif defined SINIX
#define TOOLS_INETDEF_OS "SINIX"
#elif defined IRIX
--- tools/inc/solar.h.orig Wed Apr 26 16:42:59 2006
+++ tools/inc/solar.h Thu May 25 18:37:19 2006
@@ -397,9 +397,12 @@
#elif defined LINUX && defined __x86_64__
#define __DLLEXTENSION "lx.so"
#define SYSTEM_ID SYSTEM_UNXLNXX
-#elif defined FREEBSD
+#elif defined FREEBSD && defined X86
#define __DLLEXTENSION "fi.so"
#define SYSTEM_ID SYSTEM_UNXFBSDI
+#elif defined FREEBSD && defined X86_64
+ #define __DLLEXTENSION "fx.so"
+ #define SYSTEM_ID SYSTEM_UNXFBSDX
#elif defined IRIX
#define __DLLEXTENSION "im.so"
#define SYSTEM_ID SYSTEM_UNXIRXM

516
editors/openoffice.org-2/files/patch-i66666
View File

@ -19,519 +19,3 @@ diff -u -r1.44 solar.h
#undef _SOLAR__PRIVATE
#endif
Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.11
diff -u -r1.11 SalGtkFilePicker.cxx
--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11
+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -208,7 +208,7 @@
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL );
+ (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -347,7 +347,7 @@
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_pack_start (column, cell, FALSE);
- gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
}
@@ -377,7 +377,7 @@
PangoRectangle row_height;
pango_layout_set_markup (layout, "All Files", -1);
pango_layout_get_pixel_extents (layout, NULL, &row_height);
- g_object_get (cell, "ypad", &ypad, NULL);
+ g_object_get (cell, "ypad", &ypad, (void *)NULL);
guint height = (row_height.height + 2*ypad) * 5;
gtk_widget_set_size_request (m_pFilterView, -1, height);
gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -1414,7 +1414,7 @@
}
if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
g_object_set( pWidget, "label", aTxt.getStr(),
- "use_underline", TRUE, NULL );
+ "use_underline", TRUE, (void *)NULL );
else
OSL_TRACE("Can't set label on list\n");
}
Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
retrieving revision 1.6
diff -u -r1.6 SalGtkFolderPicker.cxx
--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 8 Sep 2005 23:35:19 -0000 1.6
+++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -125,7 +125,7 @@
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.27
diff -u -r1.27 salnativewidgets-gtk.cxx
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 11 May 2006 10:00:59 -0000 1.27
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 16 Jun 2006 00:59:16 -0000
@@ -550,7 +550,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
Rectangle aForward;
Rectangle aBackward;
@@ -910,7 +910,7 @@
gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
gtk_widget_style_get( pWidget,
"indicator_size", &indicator_size,
- NULL );
+ (void *)NULL );
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
(rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
@@ -928,7 +928,7 @@
gtk_widget_style_get( widget,
"indicator_size", &indicator_size,
"indicator_spacing", &indicator_spacing,
- NULL);
+ (void *)NULL);
indicator_size += 2*indicator_spacing; // guess overpaint of theme
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
@@ -978,7 +978,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1081,7 +1081,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1134,7 +1134,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1192,7 +1192,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1291,7 +1291,7 @@
"stepper_size", &stepper_size,
"trough_border", &trough_border,
"stepper_spacing", &stepper_spacing,
- "min_slider_length", &min_slider_length, NULL );
+ "min_slider_length", &min_slider_length, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
gboolean has_backward;
@@ -1300,7 +1300,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint magic = trough_border ? 1 : 0;
gint nFirst = 0;
@@ -1570,7 +1570,7 @@
gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
"stepper-size", &stepper_size,
"trough-border", &trough_border,
- "stepper-spacing", &stepper_spacing, NULL );
+ "stepper-spacing", &stepper_spacing, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
@@ -1580,7 +1580,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint buttonWidth;
gint buttonHeight;
Rectangle buttonRect;
@@ -1687,7 +1687,7 @@
// Grab some entry style attributes
gtk_widget_style_get( gEditBoxWidget, "focus-line-width", &focusWidth,
- "interior-focus", &interiorFocus, NULL );
+ "interior-focus", &interiorFocus, (void *)NULL );
if ( !interiorFocus )
{
@@ -1838,7 +1838,7 @@
}
NWSetWidgetState( gSpinButtonWidget, nState, stateType );
- gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
+ gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
if ( shadowType != GTK_SHADOW_NONE )
{
@@ -2048,7 +2048,7 @@
// Grab some button style attributes
gtk_widget_style_get( gDropdownWidget, "focus-line-width", &nFocusWidth,
- "focus-padding", &nFocusPad, NULL );
+ "focus-padding", &nFocusPad, (void *)NULL );
nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
nButtonWidth = nArrowWidth +
@@ -2272,7 +2272,7 @@
"interior_focus", &bInteriorFocus,
"focus_line_width", &nFocusLineWidth,
"focus_padding", &nFocusPadding,
- NULL);
+ (void *)NULL);
}
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -2482,7 +2482,7 @@
{
gtk_widget_style_get( gMenuItemMenubarWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
}
@@ -2571,7 +2571,7 @@
{
gtk_widget_style_get( gMenuItemMenuWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
NWSetWidgetState( gMenuWidget, nState, stateType );
@@ -2730,7 +2730,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
width = pIndicatorSize->width;
@@ -2791,7 +2791,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
{
@@ -3074,11 +3074,11 @@
GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
gboolean blink = false;
- g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
if( blink )
{
gint blink_time = STYLE_CURSOR_NOBLINKTIME;
- g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
// set the blink_time if there is a setting and it is reasonable
// else leave the default value
if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -3097,7 +3097,7 @@
"slider-width", &slider_width,
"trough-border", &trough_border,
"min-slider-length", &min_slider_length,
- NULL );
+ (void *)NULL );
gint magic = trough_border ? 1 : 0;
aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
aStyleSet.SetMinThumbSize( min_slider_length - magic );
@@ -3439,7 +3439,7 @@
gtk_widget_ensure_style( gToolbarWidget );
gtk_widget_style_get( gToolbarWidget,
"button_relief", &aRelief,
- NULL);
+ (void *)NULL);
gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
Index: vcl/unx/source/app/i18n_cb.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
retrieving revision 1.28
diff -u -r1.28 i18n_cb.cxx
--- vcl/unx/source/app/i18n_cb.cxx 19 Apr 2006 13:56:47 -0000 1.28
+++ vcl/unx/source/app/i18n_cb.cxx 16 Jun 2006 00:59:17 -0000
@@ -463,8 +463,8 @@
point.y = mPosEvent.mnY + mPosEvent.mnHeight;
XVaNestedList preedit_attr;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
- XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
+ XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
return;
@@ -600,7 +600,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( ic,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
Index: vcl/unx/source/app/i18n_ic.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_ic.cxx
--- vcl/unx/source/app/i18n_ic.cxx 16 Jan 2006 13:07:29 -0000 1.35
+++ vcl/unx/source/app/i18n_ic.cxx 16 Jun 2006 00:59:17 -0000
@@ -137,7 +137,7 @@
a_dstlist = XVaCreateNestedList(
0,
name, value,
- NULL );
+ (void *)NULL );
}
else
{
@@ -145,7 +145,7 @@
0,
XNVaNestedList, a_srclist,
name, value,
- NULL );
+ (void *)NULL );
}
return a_dstlist != NULL ? a_dstlist : a_srclist ;
@@ -263,7 +263,7 @@
XNStatusStartCallback, &aStatusStartCallback,
XNStatusDoneCallback, &aStatusDoneCallback,
XNStatusDrawCallback, &aStatusDrawCallback,
- NULL );
+ (void *)NULL );
break;
}
@@ -302,7 +302,7 @@
XNPreeditDoneCallback, &maPreeditDoneCallback,
XNPreeditDrawCallback, &maPreeditDrawCallback,
XNPreeditCaretCallback, &maPreeditCaretCallback,
- NULL );
+ (void *)NULL );
break;
@@ -324,7 +324,7 @@
mpPreeditAttributes = XVaCreateNestedList (
0,
XNSpotLocation, &aSpot,
- NULL );
+ (void *)NULL );
// XCreateIC() fails on Redflag Linux 2.0 if there is no
// fontset though the data itself is not evaluated nor is
@@ -357,7 +357,7 @@
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
XNInputStyle, mnPreeditStyle | mnStatusStyle,
- NULL );
+ (void *)NULL );
if ( mnPreeditStyle != XIMPreeditNone )
{
@@ -377,7 +377,7 @@
}
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
}
if ( maContext == NULL )
@@ -416,7 +416,7 @@
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if ( maContext != NULL)
{
@@ -424,7 +424,7 @@
maDestroyCallback.client_data = (XPointer)this;
XSetICValues( maContext,
XNDestroyCallback, &maDestroyCallback,
- NULL );
+ (void *)NULL );
}
if( mbMultiLingual )
@@ -433,7 +433,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( maContext,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
@@ -481,12 +481,12 @@
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
if ( maContext != NULL && mbMultiLingual )
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if( maClientData.pFrame != pFrame )
SetICFocus( pFrame );
@@ -529,7 +529,7 @@
&aWindowAttributes );
XGetICValues ( maContext,
XNFilterEvents, &nIMEventMask,
- NULL);
+ (void *)NULL);
nIMEventMask |= aWindowAttributes.your_event_mask;
XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
}
@@ -685,8 +685,8 @@
aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
- XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
I18NStatus::get().show( true, I18NStatus::contextmap );
@@ -717,7 +717,7 @@
XSetICValues( maContext,
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
- NULL );
+ (void *)NULL );
if( maClientData.aInputEv.mpTextAttr )
{
@@ -761,8 +761,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, &preedit_state,
- NULL);
- if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
+ (void *)NULL);
+ if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
{
XFree(preedit_attr);
@@ -770,8 +770,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, preedit_state,
- NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
}
XFree(preedit_attr);
Index: vcl/unx/source/app/i18n_im.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_im.cxx
--- vcl/unx/source/app/i18n_im.cxx 7 Apr 2006 08:04:45 -0000 1.35
+++ vcl/unx/source/app/i18n_im.cxx 16 Jun 2006 00:59:17 -0000
@@ -427,13 +427,13 @@
mbMultiLingual = False;
else
if ( XGetIMValues(maMethod,
- XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
+ XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
mbMultiLingual = False;
if( mbMultiLingual )
{
XIMUnicodeCharacterSubsets* subsets;
if( XGetIMValues( maMethod,
- XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
+ XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
@@ -473,7 +473,7 @@
if ( maMethod != (XIM)NULL )
{
- if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
+ if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
!= NULL)
mbUseable = False;
#if OSL_DEBUG_LEVEL > 1
@@ -496,7 +496,7 @@
maDestroyCallback.callback = (XIMProc)IM_IMDestroyCallback;
maDestroyCallback.client_data = (XPointer)this;
if (mbUseable && maMethod != NULL)
- XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
+ XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
return mbUseable;
}
Index: vcl/unx/source/app/i18n_status.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
retrieving revision 1.30
diff -u -r1.30 i18n_status.cxx
--- vcl/unx/source/app/i18n_status.cxx 16 Jan 2006 13:08:00 -0000 1.30
+++ vcl/unx/source/app/i18n_status.cxx 16 Jun 2006 00:59:17 -0000
@@ -502,7 +502,7 @@
XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
XNUnicodeCharacterSubset,
rChoices[nIndex].pData,
- NULL);
+ (void *)NULL);
// FIXME: get rid of X11SalFrame
X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
if( pParent && pParent->isMapped() )

20
editors/openoffice.org-2/files/patch-i66667
View File

@ -1,10 +1,10 @@
Index: gtkinst.cxx
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
retrieving revision 1.13
diff -u -r1.13 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13
+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000
retrieving revision 1.14.88.1
diff -u -r1.14.88.1 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1
+++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000
@@ -43,6 +43,7 @@
#include <plugins/gtk/atkbridge.hxx>
@ -13,15 +13,14 @@ diff -u -r1.13 gtkinst.cxx
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -111,13 +112,28 @@
@@ -111,11 +112,26 @@
GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsLeave();
}
- static bool hookLocks( oslModule pModule )
+ static bool hookLocks( void )
{
- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ /* XXX GDK library path should be set by configure. */
@ -40,11 +39,8 @@ diff -u -r1.13 gtkinst.cxx
+ }
+
GdkLockFn gdk_threads_set_lock_functions =
- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
if ( !gdk_threads_set_lock_functions )
{
#if OSL_DEBUG_LEVEL > 1
@@ -150,7 +166,7 @@
if ( !g_thread_supported() )
g_thread_init( NULL );

27
editors/openoffice.org-3-RC/Makefile
View File

@ -13,21 +13,25 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
#DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
DISTFILES+= OOo_2.0.1_src.tar.gz
DISTFILES+= unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
#EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
EXTRACT_ONLY= OOo_2.0.1_src.tar.gz
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
OOOVERSION= 2.0.3
OOOVERSION= 2.0.4.m1
NO_LATEST_LINK= yes
USE_GNOME= gtk20 gnomevfs2
MOZILLA_VERSION= 1.7.5
@ -71,7 +75,7 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
OOOTAG?= OOC680_m7
OOOTAG?= OOD680_m1
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
@ -153,11 +157,9 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
.if (${GCCVER} == 41)
@ -197,6 +199,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
@ -254,10 +257,10 @@ post-install:
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
.if defined(WITH_KDE)
@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applnk/${EXECBASE}
@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \

9
editors/openoffice.org-3-RC/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = f68832ff3458664ae2b741ec67d30104
SHA256 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 31c82e971763827c5f55d036bbb4d6e7c7a732ca73e37ce56312b276d1a0a7b5
SIZE (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 307317482
MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 45545bcaa0733eefdce158010c42e638
SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = a3361d325c125e30f59b2cc502c3e7937cb902dcc9ec4efc7909049521554610
SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 319068872
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

54
editors/openoffice.org-3-RC/files/patch-i64442
View File

@ -1,54 +0,0 @@
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000
@@ -63,13 +63,8 @@
char const* const* GnuInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#ifdef X86_64
- "/lib64/libgcj.so.7",
- "/lib64/libgcj.so.6"
-#else
- "/lib/libgcj.so.7",
- "/lib/libgcj.so.6"
-#endif
+ "/libgcj.so.7",
+ "/libgcj.so.6"
};
*size = sizeof(ar) / sizeof (char*);
return ar;
@@ -87,7 +82,7 @@
OUString sVersionProperty(
RTL_CONSTASCII_USTRINGPARAM("java.version"));
OUString sHomeProperty(
- RTL_CONSTASCII_USTRINGPARAM("java.home"));
+ RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
OUString sAccessProperty(
RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -111,19 +106,8 @@
}
else if (!bHome && sHomeProperty.equals(i->first))
{
- OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
- osl_File_E_None)
- {
- //make sure that the drive letter have all the same case
- //otherwise file:///c:/jre and file:///C:/jre produce two
- //different objects!!!
- if (makeDriveLetterSame( & fileURL))
- {
- m_sHome = fileURL;
- bHome = true;
- }
- }
+ m_sHome = i->second;
+ bHome = true;
}
else if (!bAccess && sAccessProperty.equals(i->first))
{

19
editors/openoffice.org-3-RC/files/patch-i64762
View File

@ -1,19 +0,0 @@
Index: sal/osl/unx/security.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/security.c,v
retrieving revision 1.18
diff -u -r1.18 security.c
--- sal/osl/unx/security.c 20 Apr 2006 16:24:05 -0000 1.18
+++ sal/osl/unx/security.c 25 Apr 2006 21:35:23 -0000
@@ -57,6 +57,11 @@
#define PAM_BINARY_MSG 6
#endif
+#include <stdint.h> //C99 contains SIZE_MAX
+#ifndef SIZE_MAX
+#define SIZE_MAX (sizeof (size_t) -1)
+#endif
+
extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
static oslSecurityError SAL_CALL

4767
editors/openoffice.org-3-RC/files/patch-i64815
View File

File diff suppressed because it is too large Load Diff

11
editors/openoffice.org-3-RC/files/patch-i64906
View File

@ -1,11 +0,0 @@
--- sal/osl/unx/security.c~ Wed May 10 20:57:40 2006
+++ sal/osl/unx/security.c Wed May 10 22:35:43 2006
@@ -73,7 +73,7 @@
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#ifdef MACOSX
+#if defined (MACOSX) || defined (FREEBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
size_t n = 1024;
#else

2718
editors/openoffice.org-3-RC/files/patch-i65467
View File

File diff suppressed because it is too large Load Diff

33
editors/openoffice.org-3-RC/files/patch-i65468
View File

@ -1,33 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.9
diff -u -r1.9 epm-3.7.patch
--- epm/epm-3.7.patch 17 Feb 2006 16:16:42 -0000 1.9
+++ epm/epm-3.7.patch 15 May 2006 21:54:11 -0000
@@ -659,3 +659,25 @@
putc(*s, fp);
}
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Mon May 15 13:48:17 2006
+***************
+*** 348,355 ****
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...
+--- 348,356 ----
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tbz %s", name, directory))
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...

18
editors/openoffice.org-3-RC/files/patch-i65511
View File

@ -1,18 +0,0 @@
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig Wed Sep 7 15:31:11 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Thu May 25 14:20:37 2006
@@ -76,6 +76,7 @@
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif
@@ -90,6 +91,7 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

61
editors/openoffice.org-3-RC/files/patch-i65512
View File

@ -1,61 +0,0 @@
--- sal/osl/unx/socket.c.orig Thu Sep 8 11:01:17 2005
+++ sal/osl/unx/socket.c Fri May 5 19:14:17 2006
@@ -813,7 +813,7 @@
const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop)
{
-#ifdef LINUX
+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
struct hostent *__result; /* will be the same as result */
int __error;
__error = gethostbyname_r (name, result, buffer, buflen,
--- sal/osl/unx/system.c.orig Fri Apr 7 04:06:25 2006
+++ sal/osl/unx/system.c Fri May 5 19:18:51 2006
@@ -343,6 +343,8 @@
}
#endif /* defined SCO */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -433,6 +435,7 @@
return res;
}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#if defined(MACOSX)
/*
--- sal/osl/unx/system.h.orig Thu May 4 04:48:25 2006
+++ sal/osl/unx/system.h Wed May 24 16:06:13 2006
@@ -543,8 +543,10 @@
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#endif
#endif /* __OSL_SYSTEM_H__ */
--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006
+++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006
@@ -7697,3 +7697,15 @@
# Force applications to be built non-statically
# when building the mozcomps meta component
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004
++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006
+@@ -105,7 +105,8 @@
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
+
+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
++ (defined(__FreeBSD__) && __FreeBSD_version > 601103)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

591
editors/openoffice.org-3-RC/files/patch-i65513
View File

@ -1,591 +0,0 @@
--- config_office/set_soenv.in Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Tue May 23 14:31:50 2006
@@ -320,32 +320,60 @@
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
-{ print "Setting FreeBSD specific values... ";
- $outfile = "FreeBSDEnv.Set";
- $BIG_SVX = "TRUE";
+{ $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
- $CPU = "I";
- $CPUNAME = "INTEL";
$CVER = "C300";
$GUI = "UNX";
$GUIBASE = "unx";
$GUIENV = "sal";
$GVER = "VCL";
- $OUTPATH = "unxfbsd";
- $INPATH = $OUTPATH.$PROEXT;
- $GVERDIR = $INPATH;
$OS = "FREEBSD";
$PATH_SEPERATOR = $ps;
$XPVERSION = "3";
$OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^amd64/)
+ { my ( $JAVA_OS );
+ print "Setting FreeBSD AMD64 specific values... ";
+ $outfile = "FreeBSDAMDEnv.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxfbsdx";
+ $JAVA_OS = '@JAVA_HOME@';
+ $JAVA_OS =~ s/.*\///;
+ if ($JAVA_OS =~ m/^linux/)
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ }
+ else
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }
+ }
+ elsif ($platform =~ m/^i386/)
+ { print "Setting FreeBSD Intel specific values... ";
+ $outfile = "FreeBSDIntelEnv.Set";
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $OUTPATH = "unxfbsdi";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- if( @GCCVER@ >= 30401 ) {
- $CVER = "C341";
- }
+ }
+ else
+ { print "Unsupported FreeBSD architecture: $platform \n";
+ exit 1;
+ }
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
+ $INPATH = $OUTPATH.$PROEXT;
+ $GVERDIR = $INPATH;
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -963,8 +991,7 @@
$D.$OS.
$D.$CPUNAME;
if ($platform =~ m/freebsd/)
- { $SOLARDEF .= $D."X86".
- $D."OSVERSION=$OSVERSION".
+ { $SOLARDEF .= $D."OSVERSION=$OSVERSION".
" @PTHREAD_CFLAGS@";
}
$SOLARDEF .= $D."_REENTRANT".
@@ -1294,6 +1321,7 @@
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--- solenv/inc/unx.mk Fri May 19 13:55:04 2006
+++ solenv/inc/unx.mk Fri May 19 13:38:42 2006
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-.INCLUDE : unxfbsdi.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
--- solenv/inc/unxfbsd.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsd.mk Fri May 19 13:52:02 2006
@@ -0,0 +1,220 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+# Makefile for FreeBSD.
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
+
+# Include arch specific makefile.
+.IF "$(CPUNAME)" == "INTEL"
+.INCLUDE : unxfbsdi.mk
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+.INCLUDE : unxfbsdx.mk
+.ENDIF
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+PICSWITCH:=-fpic
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+# Enable all warnings
+CFLAGSWALL=-Wall
+# Set default warn level
+CFLAGSDFLTWARN=
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+STDLIBGUIST=-lX11 -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
--- solenv/inc/unxfbsdi.mk Tue Jan 31 13:24:38 2006
+++ solenv/inc/unxfbsdi.mk Fri May 19 13:52:19 2006
@@ -33,192 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
+#
+# FreBSD/i386 specific defines
+#
-SOLAR_JAVA*=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
+CDEFS+=-DX86
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=-mtune=pentiumpro
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
-CFLAGSOBJGUIST=
-# Compiler flags for compiling static object in single threaded environment with character user interface
-CFLAGSOBJCUIST=
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-CFLAGSOPT+=-Wuninitialized # not supported without optimization
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
+CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-# Enable all warnings
-CFLAGSWALL=-Wall
-# Set default warn level
-CFLAGSDFLTWARN=
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBCUIST=-lm
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-STDLIBGUIST=-lX11 -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-STDSHLGUIST=-lX11 -lXext -lm
-STDSHLCUIST=-lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
# platform specific identifier for shared libs
DLLPOSTFIX=fi
-DLLPRE=lib
-DLLPOST=.so
-
--- solenv/inc/unxfbsdx.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsdx.mk Fri May 19 13:52:38 2006
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+#
+# FreBSD/amd64 specific defines
+#
+
+CDEFS+=-DX86_64
+
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+.IF "$(CPUNAME)" == "X86_64"
+ARCH_FLAGS*=
+.ENDIF
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

140
editors/openoffice.org-3-RC/files/patch-i65514
View File

@ -1,140 +0,0 @@
--- berkeleydb/db-4.2.52.patch.orig Fri Dec 23 09:22:46 2005
+++ berkeleydb/db-4.2.52.patch Fri May 19 17:44:11 2006
@@ -205,6 +205,20 @@
! $(SLO)$/dbreg_util.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006
+***************
+*** 193,198 ****
+--- 193,201 ----
+ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
+ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
+
++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100
--- misc/build/db-4.2.52.NC/dist/configure 2005-12-22 18:36:14.647415000 +0100
***************
@@ -241,6 +255,76 @@
fi
# Commands to make compiler produce verbose output that lists
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
++ if test "$db_cv_mutex" = no; then
++ cat >conftest.$ac_ext <<_ACEOF
++ #line $LINENO "configure"
++ /* confdefs.h. */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h. */
++
++ int
++ main ()
++ {
++
++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
++ exit(0);
++ #else
++ FAIL TO COMPILE/LINK
++ #endif
++
++ ;
++ return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ db_cv_mutex="x86_64/gcc-assembly"
++ else
++ echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++
++ fi
++ rm -f conftest.$ac_objext conftest.$ac_ext
++ fi
++
+ # S390/cc: IBM OS/390 Unix
+ if test "$db_cv_mutex" = no; then
+ cat >conftest.$ac_ext <<_ACEOF
+***************
+*** 28971,28976 ****
+--- 29016,29028 ----
+ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
++ _ACEOF
++
++
++ ;;
++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++ cat >>confdefs.h <<\_ACEOF
++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
+ _ACEOF
+
+
*** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
--- misc/build/db-4.2.52.NC/dist/ltmain.sh 2005-12-22 18:36:14.447413000 +0100
***************
@@ -943,3 +1027,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003
+--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006
+***************
+*** 781,786 ****
+--- 781,811 ----
+ #endif
+ #endif
+
++ /*********************************************************************
++ * x86_64/gcc assembly.
++ *********************************************************************/
++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++ typedef unsigned char tsl_t;
++
++ #ifdef LOAD_ACTUAL_MUTEX_CODE
++ /*
++ * For gcc/x86-64, 0 is clear, 1 is set.
++ */
++ #define MUTEX_SET(tsl) ({ \
++ register tsl_t *__l = (tsl); \
++ int __r; \
++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
++ : "=&a" (__r), "=m" (*__l) \
++ : "1" (*__l) \
++ ); \
++ __r & 1; \
++ })
++
++ #define MUTEX_UNSET(tsl) (*(tsl) = 0)
++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
++ #endif
++ #endif
++
+ /*
+ * Mutex alignment defaults to one byte.
+ *

16
editors/openoffice.org-3-RC/files/patch-i66064
View File

@ -1,16 +0,0 @@
Index: unx/source/gdi/salprnpsp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
retrieving revision 1.40
diff -u -r1.40 salprnpsp.cxx
--- vcl/unx/source/gdi/salprnpsp.cxx 22 Mar 2006 09:46:43 -0000 1.40
+++ vcl/unx/source/gdi/salprnpsp.cxx 27 May 2006 00:31:26 -0000
@@ -101,6 +101,8 @@
// NETBSD has no RTLD_GLOBAL
#ifndef RTLD_GLOBAL
#define DLOPEN_MODE (RTLD_LAZY)
+#elif defined(FREEBSD)
+#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL)
#else
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
#endif

29
editors/openoffice.org-3-RC/files/patch-i66065
View File

@ -1,29 +0,0 @@
--- tools/inc/inetdef.hxx.orig Fri Sep 9 09:42:51 2005
+++ tools/inc/inetdef.hxx Thu May 25 18:31:02 2006
@@ -65,7 +65,9 @@
#elif defined LINUX && defined X86
#define TOOLS_INETDEF_OS "Linux"
#elif defined FREEBSD && defined X86
-#define TOOLS_INETDEF_OS "FreeBSD"
+#define TOOLS_INETDEF_OS "FreeBSD/i386"
+#elif defined FREEBSD && defined X86_64
+#define TOOLS_INETDEF_OS "FreeBSD/amd64"
#elif defined SINIX
#define TOOLS_INETDEF_OS "SINIX"
#elif defined IRIX
--- tools/inc/solar.h.orig Wed Apr 26 16:42:59 2006
+++ tools/inc/solar.h Thu May 25 18:37:19 2006
@@ -397,9 +397,12 @@
#elif defined LINUX && defined __x86_64__
#define __DLLEXTENSION "lx.so"
#define SYSTEM_ID SYSTEM_UNXLNXX
-#elif defined FREEBSD
+#elif defined FREEBSD && defined X86
#define __DLLEXTENSION "fi.so"
#define SYSTEM_ID SYSTEM_UNXFBSDI
+#elif defined FREEBSD && defined X86_64
+ #define __DLLEXTENSION "fx.so"
+ #define SYSTEM_ID SYSTEM_UNXFBSDX
#elif defined IRIX
#define __DLLEXTENSION "im.so"
#define SYSTEM_ID SYSTEM_UNXIRXM

516
editors/openoffice.org-3-RC/files/patch-i66666
View File

@ -19,519 +19,3 @@ diff -u -r1.44 solar.h
#undef _SOLAR__PRIVATE
#endif
Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.11
diff -u -r1.11 SalGtkFilePicker.cxx
--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11
+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -208,7 +208,7 @@
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL );
+ (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -347,7 +347,7 @@
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_pack_start (column, cell, FALSE);
- gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
}
@@ -377,7 +377,7 @@
PangoRectangle row_height;
pango_layout_set_markup (layout, "All Files", -1);
pango_layout_get_pixel_extents (layout, NULL, &row_height);
- g_object_get (cell, "ypad", &ypad, NULL);
+ g_object_get (cell, "ypad", &ypad, (void *)NULL);
guint height = (row_height.height + 2*ypad) * 5;
gtk_widget_set_size_request (m_pFilterView, -1, height);
gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -1414,7 +1414,7 @@
}
if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
g_object_set( pWidget, "label", aTxt.getStr(),
- "use_underline", TRUE, NULL );
+ "use_underline", TRUE, (void *)NULL );
else
OSL_TRACE("Can't set label on list\n");
}
Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
retrieving revision 1.6
diff -u -r1.6 SalGtkFolderPicker.cxx
--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 8 Sep 2005 23:35:19 -0000 1.6
+++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -125,7 +125,7 @@
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.27
diff -u -r1.27 salnativewidgets-gtk.cxx
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 11 May 2006 10:00:59 -0000 1.27
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 16 Jun 2006 00:59:16 -0000
@@ -550,7 +550,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
Rectangle aForward;
Rectangle aBackward;
@@ -910,7 +910,7 @@
gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
gtk_widget_style_get( pWidget,
"indicator_size", &indicator_size,
- NULL );
+ (void *)NULL );
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
(rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
@@ -928,7 +928,7 @@
gtk_widget_style_get( widget,
"indicator_size", &indicator_size,
"indicator_spacing", &indicator_spacing,
- NULL);
+ (void *)NULL);
indicator_size += 2*indicator_spacing; // guess overpaint of theme
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
@@ -978,7 +978,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1081,7 +1081,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1134,7 +1134,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1192,7 +1192,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1291,7 +1291,7 @@
"stepper_size", &stepper_size,
"trough_border", &trough_border,
"stepper_spacing", &stepper_spacing,
- "min_slider_length", &min_slider_length, NULL );
+ "min_slider_length", &min_slider_length, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
gboolean has_backward;
@@ -1300,7 +1300,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint magic = trough_border ? 1 : 0;
gint nFirst = 0;
@@ -1570,7 +1570,7 @@
gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
"stepper-size", &stepper_size,
"trough-border", &trough_border,
- "stepper-spacing", &stepper_spacing, NULL );
+ "stepper-spacing", &stepper_spacing, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
@@ -1580,7 +1580,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint buttonWidth;
gint buttonHeight;
Rectangle buttonRect;
@@ -1687,7 +1687,7 @@
// Grab some entry style attributes
gtk_widget_style_get( gEditBoxWidget, "focus-line-width", &focusWidth,
- "interior-focus", &interiorFocus, NULL );
+ "interior-focus", &interiorFocus, (void *)NULL );
if ( !interiorFocus )
{
@@ -1838,7 +1838,7 @@
}
NWSetWidgetState( gSpinButtonWidget, nState, stateType );
- gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
+ gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
if ( shadowType != GTK_SHADOW_NONE )
{
@@ -2048,7 +2048,7 @@
// Grab some button style attributes
gtk_widget_style_get( gDropdownWidget, "focus-line-width", &nFocusWidth,
- "focus-padding", &nFocusPad, NULL );
+ "focus-padding", &nFocusPad, (void *)NULL );
nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
nButtonWidth = nArrowWidth +
@@ -2272,7 +2272,7 @@
"interior_focus", &bInteriorFocus,
"focus_line_width", &nFocusLineWidth,
"focus_padding", &nFocusPadding,
- NULL);
+ (void *)NULL);
}
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -2482,7 +2482,7 @@
{
gtk_widget_style_get( gMenuItemMenubarWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
}
@@ -2571,7 +2571,7 @@
{
gtk_widget_style_get( gMenuItemMenuWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
NWSetWidgetState( gMenuWidget, nState, stateType );
@@ -2730,7 +2730,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
width = pIndicatorSize->width;
@@ -2791,7 +2791,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
{
@@ -3074,11 +3074,11 @@
GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
gboolean blink = false;
- g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
if( blink )
{
gint blink_time = STYLE_CURSOR_NOBLINKTIME;
- g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
// set the blink_time if there is a setting and it is reasonable
// else leave the default value
if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -3097,7 +3097,7 @@
"slider-width", &slider_width,
"trough-border", &trough_border,
"min-slider-length", &min_slider_length,
- NULL );
+ (void *)NULL );
gint magic = trough_border ? 1 : 0;
aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
aStyleSet.SetMinThumbSize( min_slider_length - magic );
@@ -3439,7 +3439,7 @@
gtk_widget_ensure_style( gToolbarWidget );
gtk_widget_style_get( gToolbarWidget,
"button_relief", &aRelief,
- NULL);
+ (void *)NULL);
gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
Index: vcl/unx/source/app/i18n_cb.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
retrieving revision 1.28
diff -u -r1.28 i18n_cb.cxx
--- vcl/unx/source/app/i18n_cb.cxx 19 Apr 2006 13:56:47 -0000 1.28
+++ vcl/unx/source/app/i18n_cb.cxx 16 Jun 2006 00:59:17 -0000
@@ -463,8 +463,8 @@
point.y = mPosEvent.mnY + mPosEvent.mnHeight;
XVaNestedList preedit_attr;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
- XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
+ XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
return;
@@ -600,7 +600,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( ic,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
Index: vcl/unx/source/app/i18n_ic.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_ic.cxx
--- vcl/unx/source/app/i18n_ic.cxx 16 Jan 2006 13:07:29 -0000 1.35
+++ vcl/unx/source/app/i18n_ic.cxx 16 Jun 2006 00:59:17 -0000
@@ -137,7 +137,7 @@
a_dstlist = XVaCreateNestedList(
0,
name, value,
- NULL );
+ (void *)NULL );
}
else
{
@@ -145,7 +145,7 @@
0,
XNVaNestedList, a_srclist,
name, value,
- NULL );
+ (void *)NULL );
}
return a_dstlist != NULL ? a_dstlist : a_srclist ;
@@ -263,7 +263,7 @@
XNStatusStartCallback, &aStatusStartCallback,
XNStatusDoneCallback, &aStatusDoneCallback,
XNStatusDrawCallback, &aStatusDrawCallback,
- NULL );
+ (void *)NULL );
break;
}
@@ -302,7 +302,7 @@
XNPreeditDoneCallback, &maPreeditDoneCallback,
XNPreeditDrawCallback, &maPreeditDrawCallback,
XNPreeditCaretCallback, &maPreeditCaretCallback,
- NULL );
+ (void *)NULL );
break;
@@ -324,7 +324,7 @@
mpPreeditAttributes = XVaCreateNestedList (
0,
XNSpotLocation, &aSpot,
- NULL );
+ (void *)NULL );
// XCreateIC() fails on Redflag Linux 2.0 if there is no
// fontset though the data itself is not evaluated nor is
@@ -357,7 +357,7 @@
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
XNInputStyle, mnPreeditStyle | mnStatusStyle,
- NULL );
+ (void *)NULL );
if ( mnPreeditStyle != XIMPreeditNone )
{
@@ -377,7 +377,7 @@
}
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
}
if ( maContext == NULL )
@@ -416,7 +416,7 @@
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if ( maContext != NULL)
{
@@ -424,7 +424,7 @@
maDestroyCallback.client_data = (XPointer)this;
XSetICValues( maContext,
XNDestroyCallback, &maDestroyCallback,
- NULL );
+ (void *)NULL );
}
if( mbMultiLingual )
@@ -433,7 +433,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( maContext,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
@@ -481,12 +481,12 @@
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
if ( maContext != NULL && mbMultiLingual )
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if( maClientData.pFrame != pFrame )
SetICFocus( pFrame );
@@ -529,7 +529,7 @@
&aWindowAttributes );
XGetICValues ( maContext,
XNFilterEvents, &nIMEventMask,
- NULL);
+ (void *)NULL);
nIMEventMask |= aWindowAttributes.your_event_mask;
XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
}
@@ -685,8 +685,8 @@
aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
- XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
I18NStatus::get().show( true, I18NStatus::contextmap );
@@ -717,7 +717,7 @@
XSetICValues( maContext,
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
- NULL );
+ (void *)NULL );
if( maClientData.aInputEv.mpTextAttr )
{
@@ -761,8 +761,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, &preedit_state,
- NULL);
- if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
+ (void *)NULL);
+ if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
{
XFree(preedit_attr);
@@ -770,8 +770,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, preedit_state,
- NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
}
XFree(preedit_attr);
Index: vcl/unx/source/app/i18n_im.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_im.cxx
--- vcl/unx/source/app/i18n_im.cxx 7 Apr 2006 08:04:45 -0000 1.35
+++ vcl/unx/source/app/i18n_im.cxx 16 Jun 2006 00:59:17 -0000
@@ -427,13 +427,13 @@
mbMultiLingual = False;
else
if ( XGetIMValues(maMethod,
- XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
+ XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
mbMultiLingual = False;
if( mbMultiLingual )
{
XIMUnicodeCharacterSubsets* subsets;
if( XGetIMValues( maMethod,
- XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
+ XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
@@ -473,7 +473,7 @@
if ( maMethod != (XIM)NULL )
{
- if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
+ if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
!= NULL)
mbUseable = False;
#if OSL_DEBUG_LEVEL > 1
@@ -496,7 +496,7 @@
maDestroyCallback.callback = (XIMProc)IM_IMDestroyCallback;
maDestroyCallback.client_data = (XPointer)this;
if (mbUseable && maMethod != NULL)
- XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
+ XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
return mbUseable;
}
Index: vcl/unx/source/app/i18n_status.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
retrieving revision 1.30
diff -u -r1.30 i18n_status.cxx
--- vcl/unx/source/app/i18n_status.cxx 16 Jan 2006 13:08:00 -0000 1.30
+++ vcl/unx/source/app/i18n_status.cxx 16 Jun 2006 00:59:17 -0000
@@ -502,7 +502,7 @@
XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
XNUnicodeCharacterSubset,
rChoices[nIndex].pData,
- NULL);
+ (void *)NULL);
// FIXME: get rid of X11SalFrame
X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
if( pParent && pParent->isMapped() )

20
editors/openoffice.org-3-RC/files/patch-i66667
View File

@ -1,10 +1,10 @@
Index: gtkinst.cxx
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
retrieving revision 1.13
diff -u -r1.13 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13
+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000
retrieving revision 1.14.88.1
diff -u -r1.14.88.1 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1
+++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000
@@ -43,6 +43,7 @@
#include <plugins/gtk/atkbridge.hxx>
@ -13,15 +13,14 @@ diff -u -r1.13 gtkinst.cxx
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -111,13 +112,28 @@
@@ -111,11 +112,26 @@
GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsLeave();
}
- static bool hookLocks( oslModule pModule )
+ static bool hookLocks( void )
{
- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ /* XXX GDK library path should be set by configure. */
@ -40,11 +39,8 @@ diff -u -r1.13 gtkinst.cxx
+ }
+
GdkLockFn gdk_threads_set_lock_functions =
- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
if ( !gdk_threads_set_lock_functions )
{
#if OSL_DEBUG_LEVEL > 1
@@ -150,7 +166,7 @@
if ( !g_thread_supported() )
g_thread_init( NULL );

27
editors/openoffice.org-3/Makefile
View File

@ -13,21 +13,25 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/${OOOV
http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
#DISTFILES+= OOo_${OOOVERSION}_src.tar.gz
DISTFILES+= OOo_2.0.1_src.tar.gz
DISTFILES+= unowinreg.dll:unowinreg
.if defined(WITH_GPC)
DISTFILES+= gpc231.tar.Z:gpc
.endif
.if defined(WITH_GNUGCJ)
DISTFILES+= ${ANT_DISTFILE}:antbin
.endif
EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
#EXTRACT_ONLY= OOo_${OOOVERSION}_src.tar.gz
EXTRACT_ONLY= OOo_2.0.1_src.tar.gz
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
OOOVERSION= 2.0.3
OOOVERSION= 2.0.4.m1
NO_LATEST_LINK= yes
USE_GNOME= gtk20 gnomevfs2
MOZILLA_VERSION= 1.7.5
@ -71,7 +75,7 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
OOOTAG?= OOC680_m7
OOOTAG?= OOD680_m1
INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION}
EXECBASE?= openoffice.org-${OOOVERSION}
DIST_SUBDIR= openoffice.org2.0
@ -153,11 +157,9 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
.endif
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
#workarounds
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
CONFIGURE_ARGS+= --with-system-freetype #link error with internal one
.if ${ARCH} == amd64 || defined(WITH_GNUGCJ)
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL
.if ${ARCH} == amd64 || ${GCCVER} == 41
WITHOUT_MOZILLA= yes
.endif
.if (${GCCVER} == 41)
@ -197,6 +199,7 @@ pre-everything::
.endif
post-extract:
@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
.if defined(WITH_GNUGCJ)
@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
.endif
@ -254,10 +257,10 @@ post-install:
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
.if defined(WITH_KDE)
@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applnk/${EXECBASE}
@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
for app in base calc draw impress math printeradmin writer; do \
if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \

9
editors/openoffice.org-3/distinfo
View File

@ -1,6 +1,9 @@
MD5 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = f68832ff3458664ae2b741ec67d30104
SHA256 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 31c82e971763827c5f55d036bbb4d6e7c7a732ca73e37ce56312b276d1a0a7b5
SIZE (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 307317482
MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 45545bcaa0733eefdce158010c42e638
SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = a3361d325c125e30f59b2cc502c3e7937cb902dcc9ec4efc7909049521554610
SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 319068872
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

54
editors/openoffice.org-3/files/patch-i64442
View File

@ -1,54 +0,0 @@
Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 16 Mar 2006 13:13:00 -0000 1.7
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 28 May 2006 03:33:20 -0000
@@ -63,13 +63,8 @@
char const* const* GnuInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#ifdef X86_64
- "/lib64/libgcj.so.7",
- "/lib64/libgcj.so.6"
-#else
- "/lib/libgcj.so.7",
- "/lib/libgcj.so.6"
-#endif
+ "/libgcj.so.7",
+ "/libgcj.so.6"
};
*size = sizeof(ar) / sizeof (char*);
return ar;
@@ -87,7 +82,7 @@
OUString sVersionProperty(
RTL_CONSTASCII_USTRINGPARAM("java.version"));
OUString sHomeProperty(
- RTL_CONSTASCII_USTRINGPARAM("java.home"));
+ RTL_CONSTASCII_USTRINGPARAM("gnu.classpath.home.url"));
OUString sAccessProperty(
RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
@@ -111,19 +106,8 @@
}
else if (!bHome && sHomeProperty.equals(i->first))
{
- OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
- osl_File_E_None)
- {
- //make sure that the drive letter have all the same case
- //otherwise file:///c:/jre and file:///C:/jre produce two
- //different objects!!!
- if (makeDriveLetterSame( & fileURL))
- {
- m_sHome = fileURL;
- bHome = true;
- }
- }
+ m_sHome = i->second;
+ bHome = true;
}
else if (!bAccess && sAccessProperty.equals(i->first))
{

19
editors/openoffice.org-3/files/patch-i64762
View File

@ -1,19 +0,0 @@
Index: sal/osl/unx/security.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/security.c,v
retrieving revision 1.18
diff -u -r1.18 security.c
--- sal/osl/unx/security.c 20 Apr 2006 16:24:05 -0000 1.18
+++ sal/osl/unx/security.c 25 Apr 2006 21:35:23 -0000
@@ -57,6 +57,11 @@
#define PAM_BINARY_MSG 6
#endif
+#include <stdint.h> //C99 contains SIZE_MAX
+#ifndef SIZE_MAX
+#define SIZE_MAX (sizeof (size_t) -1)
+#endif
+
extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
static oslSecurityError SAL_CALL

4767
editors/openoffice.org-3/files/patch-i64815
View File

File diff suppressed because it is too large Load Diff

11
editors/openoffice.org-3/files/patch-i64906
View File

@ -1,11 +0,0 @@
--- sal/osl/unx/security.c~ Wed May 10 20:57:40 2006
+++ sal/osl/unx/security.c Wed May 10 22:35:43 2006
@@ -73,7 +73,7 @@
static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
-#ifdef MACOSX
+#if defined (MACOSX) || defined (FREEBSD)
/* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
size_t n = 1024;
#else

2718
editors/openoffice.org-3/files/patch-i65467
View File

File diff suppressed because it is too large Load Diff

33
editors/openoffice.org-3/files/patch-i65468
View File

@ -1,33 +0,0 @@
Index: epm/epm-3.7.patch
===================================================================
RCS file: /cvs/external/epm/epm-3.7.patch,v
retrieving revision 1.9
diff -u -r1.9 epm-3.7.patch
--- epm/epm-3.7.patch 17 Feb 2006 16:16:42 -0000 1.9
+++ epm/epm-3.7.patch 15 May 2006 21:54:11 -0000
@@ -659,3 +659,25 @@
putc(*s, fp);
}
+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003
+--- misc/build/epm-3.7/bsd.c Mon May 15 13:48:17 2006
+***************
+*** 348,355 ****
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...
+--- 348,356 ----
+ current, commentname, descrname, plistname, name))
+ return (1);
+
+! if (run_command(NULL, "mv %s.tbz %s", name, directory))
+! if (run_command(NULL, "mv %s.tgz %s", name, directory))
+! return (1);
+
+ /*
+ * Remove temporary files...

18
editors/openoffice.org-3/files/patch-i65511
View File

@ -1,18 +0,0 @@
--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig Wed Sep 7 15:31:11 2005
+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Thu May 25 14:20:37 2006
@@ -76,6 +76,7 @@
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif
@@ -90,6 +91,7 @@
static char const * ar[] = {
"/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH

61
editors/openoffice.org-3/files/patch-i65512
View File

@ -1,61 +0,0 @@
--- sal/osl/unx/socket.c.orig Thu Sep 8 11:01:17 2005
+++ sal/osl/unx/socket.c Fri May 5 19:14:17 2006
@@ -813,7 +813,7 @@
const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop)
{
-#ifdef LINUX
+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
struct hostent *__result; /* will be the same as result */
int __error;
__error = gethostbyname_r (name, result, buffer, buflen,
--- sal/osl/unx/system.c.orig Fri Apr 7 04:06:25 2006
+++ sal/osl/unx/system.c Fri May 5 19:18:51 2006
@@ -343,6 +343,8 @@
}
#endif /* defined SCO */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+
extern int h_errno;
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
@@ -433,6 +435,7 @@
return res;
}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#if defined(MACOSX)
/*
--- sal/osl/unx/system.h.orig Thu May 4 04:48:25 2006
+++ sal/osl/unx/system.h Wed May 24 16:06:13 2006
@@ -543,8 +543,10 @@
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
struct hostent *gethostbyname_r(const char *name, struct hostent *result,
char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
#endif
#endif /* __OSL_SYSTEM_H__ */
--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006
+++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006
@@ -7697,3 +7697,15 @@
# Force applications to be built non-statically
# when building the mozcomps meta component
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004
++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006
+@@ -105,7 +105,8 @@
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
+
+-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \
++ (defined(__FreeBSD__) && __FreeBSD_version > 601103)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

591
editors/openoffice.org-3/files/patch-i65513
View File

@ -1,591 +0,0 @@
--- config_office/set_soenv.in Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Tue May 23 14:31:50 2006
@@ -320,32 +320,60 @@
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
-{ print "Setting FreeBSD specific values... ";
- $outfile = "FreeBSDEnv.Set";
- $BIG_SVX = "TRUE";
+{ $BIG_SVX = "TRUE";
$COM = "GCC";
$COMPATH = '@COMPATH@';
- $CPU = "I";
- $CPUNAME = "INTEL";
$CVER = "C300";
$GUI = "UNX";
$GUIBASE = "unx";
$GUIENV = "sal";
$GVER = "VCL";
- $OUTPATH = "unxfbsd";
- $INPATH = $OUTPATH.$PROEXT;
- $GVERDIR = $INPATH;
$OS = "FREEBSD";
$PATH_SEPERATOR = $ps;
$XPVERSION = "3";
$OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^amd64/)
+ { my ( $JAVA_OS );
+ print "Setting FreeBSD AMD64 specific values... ";
+ $outfile = "FreeBSDAMDEnv.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxfbsdx";
+ $JAVA_OS = '@JAVA_HOME@';
+ $JAVA_OS =~ s/.*\///;
+ if ($JAVA_OS =~ m/^linux/)
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ }
+ else
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+ }
+ }
+ elsif ($platform =~ m/^i386/)
+ { print "Setting FreeBSD Intel specific values... ";
+ $outfile = "FreeBSDIntelEnv.Set";
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $OUTPATH = "unxfbsdi";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
$JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- if( @GCCVER@ >= 30401 ) {
- $CVER = "C341";
- }
+ }
+ else
+ { print "Unsupported FreeBSD architecture: $platform \n";
+ exit 1;
+ }
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
+ $INPATH = $OUTPATH.$PROEXT;
+ $GVERDIR = $INPATH;
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -963,8 +991,7 @@
$D.$OS.
$D.$CPUNAME;
if ($platform =~ m/freebsd/)
- { $SOLARDEF .= $D."X86".
- $D."OSVERSION=$OSVERSION".
+ { $SOLARDEF .= $D."OSVERSION=$OSVERSION".
" @PTHREAD_CFLAGS@";
}
$SOLARDEF .= $D."_REENTRANT".
@@ -1294,6 +1321,7 @@
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--- solenv/inc/unx.mk Fri May 19 13:55:04 2006
+++ solenv/inc/unx.mk Fri May 19 13:38:42 2006
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-.INCLUDE : unxfbsdi.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
--- solenv/inc/unxfbsd.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsd.mk Fri May 19 13:52:02 2006
@@ -0,0 +1,220 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+# Makefile for FreeBSD.
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=TRUE
+JAVAFLAGSDEBUG=-g
+
+# Include arch specific makefile.
+.IF "$(CPUNAME)" == "INTEL"
+.INCLUDE : unxfbsdi.mk
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+.INCLUDE : unxfbsdx.mk
+.ENDIF
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+CFLAGSCXX+= -Wno-ctor-dtor-privacy
+PICSWITCH:=-fpic
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+# Enable all warnings
+CFLAGSWALL=-Wall
+# Set default warn level
+CFLAGSDFLTWARN=
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=#-Wl,-z,defs
+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-lm
+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+STDLIBGUIST=-lX11 -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIST=-lX11 -lXext -lm
+STDSHLCUIST=-lm
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
--- solenv/inc/unxfbsdi.mk Tue Jan 31 13:24:38 2006
+++ solenv/inc/unxfbsdi.mk Fri May 19 13:52:19 2006
@@ -33,192 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
+#
+# FreBSD/i386 specific defines
+#
-SOLAR_JAVA*=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
+CDEFS+=-DX86
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=-mtune=pentiumpro
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
-CFLAGSOBJGUIST=
-# Compiler flags for compiling static object in single threaded environment with character user interface
-CFLAGSOBJCUIST=
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-CFLAGSOPT+=-Wuninitialized # not supported without optimization
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
+CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-# Enable all warnings
-CFLAGSWALL=-Wall
-# Set default warn level
-CFLAGSDFLTWARN=
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBCUIST=-lm
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-STDLIBGUIST=-lX11 -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-STDSHLGUIST=-lX11 -lXext -lm
-STDSHLCUIST=-lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
# platform specific identifier for shared libs
DLLPOSTFIX=fi
-DLLPRE=lib
-DLLPOST=.so
-
--- solenv/inc/unxfbsdx.mk Fri May 19 13:13:25 2006
+++ solenv/inc/unxfbsdx.mk Fri May 19 13:52:38 2006
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# last change: $Author$ $Date$
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 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
+#
+#*************************************************************************
+
+#
+# FreBSD/amd64 specific defines
+#
+
+CDEFS+=-DX86_64
+
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+.IF "$(CPUNAME)" == "X86_64"
+ARCH_FLAGS*=
+.ENDIF
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products
+CFLAGSOPT+=-Wuninitialized # not supported without optimization
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

140
editors/openoffice.org-3/files/patch-i65514
View File

@ -1,140 +0,0 @@
--- berkeleydb/db-4.2.52.patch.orig Fri Dec 23 09:22:46 2005
+++ berkeleydb/db-4.2.52.patch Fri May 19 17:44:11 2006
@@ -205,6 +205,20 @@
! $(SLO)$/dbreg_util.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
+--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006
+***************
+*** 193,198 ****
+--- 193,201 ----
+ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
+ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
+
++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100
--- misc/build/db-4.2.52.NC/dist/configure 2005-12-22 18:36:14.647415000 +0100
***************
@@ -241,6 +255,76 @@
fi
# Commands to make compiler produce verbose output that lists
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+
++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
++ if test "$db_cv_mutex" = no; then
++ cat >conftest.$ac_ext <<_ACEOF
++ #line $LINENO "configure"
++ /* confdefs.h. */
++ _ACEOF
++ cat confdefs.h >>conftest.$ac_ext
++ cat >>conftest.$ac_ext <<_ACEOF
++ /* end confdefs.h. */
++
++ int
++ main ()
++ {
++
++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
++ exit(0);
++ #else
++ FAIL TO COMPILE/LINK
++ #endif
++
++ ;
++ return 0;
++ }
++ _ACEOF
++ rm -f conftest.$ac_objext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ db_cv_mutex="x86_64/gcc-assembly"
++ else
++ echo "$as_me: failed program was:" >&5
++ sed 's/^/| /' conftest.$ac_ext >&5
++
++ fi
++ rm -f conftest.$ac_objext conftest.$ac_ext
++ fi
++
+ # S390/cc: IBM OS/390 Unix
+ if test "$db_cv_mutex" = no; then
+ cat >conftest.$ac_ext <<_ACEOF
+***************
+*** 28971,28976 ****
+--- 29016,29028 ----
+ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
++ _ACEOF
++
++
++ ;;
++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++ cat >>confdefs.h <<\_ACEOF
++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
+ _ACEOF
+
+
*** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
--- misc/build/db-4.2.52.NC/dist/ltmain.sh 2005-12-22 18:36:14.447413000 +0100
***************
@@ -943,3 +1027,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003
+--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006
+***************
+*** 781,786 ****
+--- 781,811 ----
+ #endif
+ #endif
+
++ /*********************************************************************
++ * x86_64/gcc assembly.
++ *********************************************************************/
++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
++ typedef unsigned char tsl_t;
++
++ #ifdef LOAD_ACTUAL_MUTEX_CODE
++ /*
++ * For gcc/x86-64, 0 is clear, 1 is set.
++ */
++ #define MUTEX_SET(tsl) ({ \
++ register tsl_t *__l = (tsl); \
++ int __r; \
++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
++ : "=&a" (__r), "=m" (*__l) \
++ : "1" (*__l) \
++ ); \
++ __r & 1; \
++ })
++
++ #define MUTEX_UNSET(tsl) (*(tsl) = 0)
++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
++ #endif
++ #endif
++
+ /*
+ * Mutex alignment defaults to one byte.
+ *

16
editors/openoffice.org-3/files/patch-i66064
View File

@ -1,16 +0,0 @@
Index: unx/source/gdi/salprnpsp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
retrieving revision 1.40
diff -u -r1.40 salprnpsp.cxx
--- vcl/unx/source/gdi/salprnpsp.cxx 22 Mar 2006 09:46:43 -0000 1.40
+++ vcl/unx/source/gdi/salprnpsp.cxx 27 May 2006 00:31:26 -0000
@@ -101,6 +101,8 @@
// NETBSD has no RTLD_GLOBAL
#ifndef RTLD_GLOBAL
#define DLOPEN_MODE (RTLD_LAZY)
+#elif defined(FREEBSD)
+#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL)
#else
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
#endif

29
editors/openoffice.org-3/files/patch-i66065
View File

@ -1,29 +0,0 @@
--- tools/inc/inetdef.hxx.orig Fri Sep 9 09:42:51 2005
+++ tools/inc/inetdef.hxx Thu May 25 18:31:02 2006
@@ -65,7 +65,9 @@
#elif defined LINUX && defined X86
#define TOOLS_INETDEF_OS "Linux"
#elif defined FREEBSD && defined X86
-#define TOOLS_INETDEF_OS "FreeBSD"
+#define TOOLS_INETDEF_OS "FreeBSD/i386"
+#elif defined FREEBSD && defined X86_64
+#define TOOLS_INETDEF_OS "FreeBSD/amd64"
#elif defined SINIX
#define TOOLS_INETDEF_OS "SINIX"
#elif defined IRIX
--- tools/inc/solar.h.orig Wed Apr 26 16:42:59 2006
+++ tools/inc/solar.h Thu May 25 18:37:19 2006
@@ -397,9 +397,12 @@
#elif defined LINUX && defined __x86_64__
#define __DLLEXTENSION "lx.so"
#define SYSTEM_ID SYSTEM_UNXLNXX
-#elif defined FREEBSD
+#elif defined FREEBSD && defined X86
#define __DLLEXTENSION "fi.so"
#define SYSTEM_ID SYSTEM_UNXFBSDI
+#elif defined FREEBSD && defined X86_64
+ #define __DLLEXTENSION "fx.so"
+ #define SYSTEM_ID SYSTEM_UNXFBSDX
#elif defined IRIX
#define __DLLEXTENSION "im.so"
#define SYSTEM_ID SYSTEM_UNXIRXM

516
editors/openoffice.org-3/files/patch-i66666
View File

@ -19,519 +19,3 @@ diff -u -r1.44 solar.h
#undef _SOLAR__PRIVATE
#endif
Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.11
diff -u -r1.11 SalGtkFilePicker.cxx
--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11
+++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -208,7 +208,7 @@
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL );
+ (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -347,7 +347,7 @@
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_pack_start (column, cell, FALSE);
- gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, (void *)NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
}
@@ -377,7 +377,7 @@
PangoRectangle row_height;
pango_layout_set_markup (layout, "All Files", -1);
pango_layout_get_pixel_extents (layout, NULL, &row_height);
- g_object_get (cell, "ypad", &ypad, NULL);
+ g_object_get (cell, "ypad", &ypad, (void *)NULL);
guint height = (row_height.height + 2*ypad) * 5;
gtk_widget_set_size_request (m_pFilterView, -1, height);
gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -1414,7 +1414,7 @@
}
if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
g_object_set( pWidget, "label", aTxt.getStr(),
- "use_underline", TRUE, NULL );
+ "use_underline", TRUE, (void *)NULL );
else
OSL_TRACE("Can't set label on list\n");
}
Index: fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx,v
retrieving revision 1.6
diff -u -r1.6 SalGtkFolderPicker.cxx
--- fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 8 Sep 2005 23:35:19 -0000 1.6
+++ fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 23 Jun 2006 18:20:18 -0000
@@ -125,7 +125,7 @@
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( aResProvider.getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (void *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.27
diff -u -r1.27 salnativewidgets-gtk.cxx
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 11 May 2006 10:00:59 -0000 1.27
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 16 Jun 2006 00:59:16 -0000
@@ -550,7 +550,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
Rectangle aForward;
Rectangle aBackward;
@@ -910,7 +910,7 @@
gMenuItemCheckMenuWidget : gMenuItemRadioMenuWidget;
gtk_widget_style_get( pWidget,
"indicator_size", &indicator_size,
- NULL );
+ (void *)NULL );
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
(rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
@@ -928,7 +928,7 @@
gtk_widget_style_get( widget,
"indicator_size", &indicator_size,
"indicator_spacing", &indicator_spacing,
- NULL);
+ (void *)NULL);
indicator_size += 2*indicator_spacing; // guess overpaint of theme
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
@@ -978,7 +978,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1081,7 +1081,7 @@
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- NULL );
+ (void *)NULL );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1134,7 +1134,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gRadioWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1192,7 +1192,7 @@
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, NULL);
+ gtk_widget_style_get( gCheckWidget, "indicator_size", &indicator_size, (void *)NULL);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1291,7 +1291,7 @@
"stepper_size", &stepper_size,
"trough_border", &trough_border,
"stepper_spacing", &stepper_spacing,
- "min_slider_length", &min_slider_length, NULL );
+ "min_slider_length", &min_slider_length, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
gboolean has_backward;
@@ -1300,7 +1300,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint magic = trough_border ? 1 : 0;
gint nFirst = 0;
@@ -1570,7 +1570,7 @@
gtk_widget_style_get( gScrollHorizWidget, "slider-width", &slider_width,
"stepper-size", &stepper_size,
"trough-border", &trough_border,
- "stepper-spacing", &stepper_spacing, NULL );
+ "stepper-spacing", &stepper_spacing, (void *)NULL );
gboolean has_forward;
gboolean has_forward2;
@@ -1580,7 +1580,7 @@
gtk_widget_style_get( gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, NULL );
+ "has-secondary-backward-stepper", &has_backward2, (void *)NULL );
gint buttonWidth;
gint buttonHeight;
Rectangle buttonRect;
@@ -1687,7 +1687,7 @@
// Grab some entry style attributes
gtk_widget_style_get( gEditBoxWidget, "focus-line-width", &focusWidth,
- "interior-focus", &interiorFocus, NULL );
+ "interior-focus", &interiorFocus, (void *)NULL );
if ( !interiorFocus )
{
@@ -1838,7 +1838,7 @@
}
NWSetWidgetState( gSpinButtonWidget, nState, stateType );
- gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, NULL );
+ gtk_widget_style_get( gSpinButtonWidget, "shadow_type", &shadowType, (void *)NULL );
if ( shadowType != GTK_SHADOW_NONE )
{
@@ -2048,7 +2048,7 @@
// Grab some button style attributes
gtk_widget_style_get( gDropdownWidget, "focus-line-width", &nFocusWidth,
- "focus-padding", &nFocusPad, NULL );
+ "focus-padding", &nFocusPad, (void *)NULL );
nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gArrowWidget)->xpad * 2);
nButtonWidth = nArrowWidth +
@@ -2272,7 +2272,7 @@
"interior_focus", &bInteriorFocus,
"focus_line_width", &nFocusLineWidth,
"focus_padding", &nFocusPadding,
- NULL);
+ (void *)NULL);
}
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -2482,7 +2482,7 @@
{
gtk_widget_style_get( gMenuItemMenubarWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
}
@@ -2571,7 +2571,7 @@
{
gtk_widget_style_get( gMenuItemMenuWidget,
"selected_shadow_type", &selected_shadow_type,
- NULL);
+ (void *)NULL);
}
NWSetWidgetState( gMenuWidget, nState, stateType );
@@ -2730,7 +2730,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
width = pIndicatorSize->width;
@@ -2791,7 +2791,7 @@
gtk_widget_style_get( gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, NULL);
+ "indicator_spacing",&pIndicatorSpacing, (void *)NULL);
if ( pIndicatorSize )
{
@@ -3074,11 +3074,11 @@
GtkSettings *pSettings = gtk_widget_get_settings( gEditBoxWidget );
gboolean blink = false;
- g_object_get( pSettings, "gtk-cursor-blink", &blink, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink", &blink, (void *)NULL );
if( blink )
{
gint blink_time = STYLE_CURSOR_NOBLINKTIME;
- g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, NULL );
+ g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (void *)NULL );
// set the blink_time if there is a setting and it is reasonable
// else leave the default value
if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -3097,7 +3097,7 @@
"slider-width", &slider_width,
"trough-border", &trough_border,
"min-slider-length", &min_slider_length,
- NULL );
+ (void *)NULL );
gint magic = trough_border ? 1 : 0;
aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
aStyleSet.SetMinThumbSize( min_slider_length - magic );
@@ -3439,7 +3439,7 @@
gtk_widget_ensure_style( gToolbarWidget );
gtk_widget_style_get( gToolbarWidget,
"button_relief", &aRelief,
- NULL);
+ (void *)NULL);
gtk_button_set_relief( GTK_BUTTON(gToolbarButtonWidget), aRelief );
GTK_WIDGET_UNSET_FLAGS( gToolbarButtonWidget, GTK_CAN_FOCUS );
Index: vcl/unx/source/app/i18n_cb.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_cb.cxx,v
retrieving revision 1.28
diff -u -r1.28 i18n_cb.cxx
--- vcl/unx/source/app/i18n_cb.cxx 19 Apr 2006 13:56:47 -0000 1.28
+++ vcl/unx/source/app/i18n_cb.cxx 16 Jun 2006 00:59:17 -0000
@@ -463,8 +463,8 @@
point.y = mPosEvent.mnY + mPosEvent.mnHeight;
XVaNestedList preedit_attr;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
- XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, (void *)NULL);
+ XSetICValues(ic, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
return;
@@ -600,7 +600,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( ic,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
::vcl::I18NStatus::get().changeIM( String( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 ) );
Index: vcl/unx/source/app/i18n_ic.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_ic.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_ic.cxx
--- vcl/unx/source/app/i18n_ic.cxx 16 Jan 2006 13:07:29 -0000 1.35
+++ vcl/unx/source/app/i18n_ic.cxx 16 Jun 2006 00:59:17 -0000
@@ -137,7 +137,7 @@
a_dstlist = XVaCreateNestedList(
0,
name, value,
- NULL );
+ (void *)NULL );
}
else
{
@@ -145,7 +145,7 @@
0,
XNVaNestedList, a_srclist,
name, value,
- NULL );
+ (void *)NULL );
}
return a_dstlist != NULL ? a_dstlist : a_srclist ;
@@ -263,7 +263,7 @@
XNStatusStartCallback, &aStatusStartCallback,
XNStatusDoneCallback, &aStatusDoneCallback,
XNStatusDrawCallback, &aStatusDrawCallback,
- NULL );
+ (void *)NULL );
break;
}
@@ -302,7 +302,7 @@
XNPreeditDoneCallback, &maPreeditDoneCallback,
XNPreeditDrawCallback, &maPreeditDrawCallback,
XNPreeditCaretCallback, &maPreeditCaretCallback,
- NULL );
+ (void *)NULL );
break;
@@ -324,7 +324,7 @@
mpPreeditAttributes = XVaCreateNestedList (
0,
XNSpotLocation, &aSpot,
- NULL );
+ (void *)NULL );
// XCreateIC() fails on Redflag Linux 2.0 if there is no
// fontset though the data itself is not evaluated nor is
@@ -357,7 +357,7 @@
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
XNInputStyle, mnPreeditStyle | mnStatusStyle,
- NULL );
+ (void *)NULL );
if ( mnPreeditStyle != XIMPreeditNone )
{
@@ -377,7 +377,7 @@
}
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
}
if ( maContext == NULL )
@@ -416,7 +416,7 @@
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if ( maContext != NULL)
{
@@ -424,7 +424,7 @@
maDestroyCallback.client_data = (XPointer)this;
XSetICValues( maContext,
XNDestroyCallback, &maDestroyCallback,
- NULL );
+ (void *)NULL );
}
if( mbMultiLingual )
@@ -433,7 +433,7 @@
XIMUnicodeCharacterSubset* pSubset = NULL;
if( ! XGetICValues( maContext,
XNUnicodeCharacterSubset, & pSubset,
- NULL )
+ (void *)NULL )
&& pSubset )
{
String aCurrent( ByteString( pSubset->name ), RTL_TEXTENCODING_UTF8 );
@@ -481,12 +481,12 @@
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ (void *)NULL );
if ( maContext != NULL && mbMultiLingual )
XSetICValues( maContext,
XNCommitStringCallback, &maCommitStringCallback,
XNSwitchIMNotifyCallback, &maSwitchIMCallback,
- NULL );
+ (void *)NULL );
}
if( maClientData.pFrame != pFrame )
SetICFocus( pFrame );
@@ -529,7 +529,7 @@
&aWindowAttributes );
XGetICValues ( maContext,
XNFilterEvents, &nIMEventMask,
- NULL);
+ (void *)NULL);
nIMEventMask |= aWindowAttributes.your_event_mask;
XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
}
@@ -685,8 +685,8 @@
aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
- XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
XFree(preedit_attr);
I18NStatus::get().show( true, I18NStatus::contextmap );
@@ -717,7 +717,7 @@
XSetICValues( maContext,
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
- NULL );
+ (void *)NULL );
if( maClientData.aInputEv.mpTextAttr )
{
@@ -761,8 +761,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, &preedit_state,
- NULL);
- if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
+ (void *)NULL);
+ if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL))
{
XFree(preedit_attr);
@@ -770,8 +770,8 @@
preedit_attr = XVaCreateNestedList(
0,
XNPreeditState, preedit_state,
- NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ (void *)NULL);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, (void *)NULL);
}
XFree(preedit_attr);
Index: vcl/unx/source/app/i18n_im.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_im.cxx,v
retrieving revision 1.35
diff -u -r1.35 i18n_im.cxx
--- vcl/unx/source/app/i18n_im.cxx 7 Apr 2006 08:04:45 -0000 1.35
+++ vcl/unx/source/app/i18n_im.cxx 16 Jun 2006 00:59:17 -0000
@@ -427,13 +427,13 @@
mbMultiLingual = False;
else
if ( XGetIMValues(maMethod,
- XNMultiLingualInput, &mbMultiLingual, NULL ) != NULL )
+ XNMultiLingualInput, &mbMultiLingual, (void *)NULL ) != NULL )
mbMultiLingual = False;
if( mbMultiLingual )
{
XIMUnicodeCharacterSubsets* subsets;
if( XGetIMValues( maMethod,
- XNQueryUnicodeCharacterSubset, &subsets, NULL ) == NULL )
+ XNQueryUnicodeCharacterSubset, &subsets, (void *)NULL ) == NULL )
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "IM reports %d subsets: ", subsets->count_subsets );
@@ -473,7 +473,7 @@
if ( maMethod != (XIM)NULL )
{
- if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
+ if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, (void *)NULL)
!= NULL)
mbUseable = False;
#if OSL_DEBUG_LEVEL > 1
@@ -496,7 +496,7 @@
maDestroyCallback.callback = (XIMProc)IM_IMDestroyCallback;
maDestroyCallback.client_data = (XPointer)this;
if (mbUseable && maMethod != NULL)
- XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
+ XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, (void *)NULL);
return mbUseable;
}
Index: vcl/unx/source/app/i18n_status.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_status.cxx,v
retrieving revision 1.30
diff -u -r1.30 i18n_status.cxx
--- vcl/unx/source/app/i18n_status.cxx 16 Jan 2006 13:08:00 -0000 1.30
+++ vcl/unx/source/app/i18n_status.cxx 16 Jun 2006 00:59:17 -0000
@@ -502,7 +502,7 @@
XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
XNUnicodeCharacterSubset,
rChoices[nIndex].pData,
- NULL);
+ (void *)NULL);
// FIXME: get rid of X11SalFrame
X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
if( pParent && pParent->isMapped() )

20
editors/openoffice.org-3/files/patch-i66667
View File

@ -1,10 +1,10 @@
Index: gtkinst.cxx
Index: vcl/unx/gtk/app/gtkinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
retrieving revision 1.13
diff -u -r1.13 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 11 May 2006 13:32:35 -0000 1.13
+++ vcl/unx/gtk/app/gtkinst.cxx 16 Jun 2006 20:48:58 -0000
retrieving revision 1.14.88.1
diff -u -r1.14.88.1 gtkinst.cxx
--- vcl/unx/gtk/app/gtkinst.cxx 10 Aug 2006 14:53:08 -0000 1.14.88.1
+++ vcl/unx/gtk/app/gtkinst.cxx 19 Aug 2006 11:13:07 -0000
@@ -43,6 +43,7 @@
#include <plugins/gtk/atkbridge.hxx>
@ -13,15 +13,14 @@ diff -u -r1.13 gtkinst.cxx
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -111,13 +112,28 @@
@@ -111,11 +112,26 @@
GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsLeave();
}
- static bool hookLocks( oslModule pModule )
+ static bool hookLocks( void )
{
- typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
+ typedef void (*GdkLockFn) ( GCallback enter_fn, GCallback leave_fn );
typedef void (*GdkLockFn) (GCallback enter_fn, GCallback leave_fn);
rtl::OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM( "gdk_threads_set_lock_functions") );
+ /* XXX GDK library path should be set by configure. */
@ -40,11 +39,8 @@ diff -u -r1.13 gtkinst.cxx
+ }
+
GdkLockFn gdk_threads_set_lock_functions =
- (GdkLockFn) osl_getSymbol( pModule, aSymbolName.pData );
+ (GdkLockFn) osl_getFunctionSymbol( aMod, aSymbolName.pData );
(GdkLockFn) osl_getFunctionSymbol( pModule, aSymbolName.pData );
if ( !gdk_threads_set_lock_functions )
{
#if OSL_DEBUG_LEVEL > 1
@@ -150,7 +166,7 @@
if ( !g_thread_supported() )
g_thread_init( NULL );