kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to SRC680_m175

Browse source
This commit is contained in:
Maho Nakata 2006-07-08 22:41:28 +00:00
parent a5e7b4023c
commit 57369015ff
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=167218
70 changed files with 1965 additions and 28485 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editors/openoffice-3-devel/Makefile
View file

@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 173
MILESTONE?= 175
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060626
SNAPDATE= 20060707
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -158,9 +158,8 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${WRKDIR}/gnugcj/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
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --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
WITHOUT_MOZILLA= yes

6
editors/openoffice-3-devel/distinfo
View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
MD5 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 9f553671a88133b60f481d27fb19356f
SHA256 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 6a521bd2876cb234a1d28c171c5e38f738f00a7d74ea47d4f1d64bc91b0a96cc
SIZE (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 248103990
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

4767
editors/openoffice-3-devel/files/patch-i64815
View file

File diff suppressed because it is too large Load diff

18
editors/openoffice-3-devel/files/patch-i65512
View file

@ -41,21 +41,3 @@
#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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

572
editors/openoffice-3-devel/files/patch-i65513
View file

@ -1,6 +1,6 @@
--- config_office/set_soenv.in.orig Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Mon May 22 17:39:23 2006
@@ -320,32 +320,60 @@
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 03:12:23 -0000 1.105.6.2
@@ -313,32 +313,60 @@ elsif ( $platform =~ m/netbsd/ )
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
@ -72,7 +72,7 @@
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -1294,6 +1322,7 @@
@@ -1296,6 +1324,7 @@ if ($platform =~ m/linux-gnu/)
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
@ -85,10 +85,11 @@ Index: solenv/inc/unx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unx.mk,v
retrieving revision 1.32
diff -u -r1.32 unx.mk
retrieving revision 1.32.158.1
diff -u -p -r1.32 -r1.32.158.1
--- solenv/inc/unx.mk 3 Feb 2006 17:33:26 -0000 1.32
+++ solenv/inc/unx.mk 27 Jun 2006 01:52:09 -0000
@@ -155,11 +155,10 @@
+++ solenv/inc/unx.mk 1 Jul 2006 06:02:12 -0000 1.32.158.1
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
@ -97,286 +98,16 @@ diff -u -r1.32 unx.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
.ENDIF
Index: solenv/inc/unxfbsdi.mk
Index: solenv/inc/unxfbsd.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.21
diff -u -r1.21 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 19 Jun 2006 17:13:50 -0000 1.21
+++ solenv/inc/unxfbsdi.mk 27 Jun 2006 01:52:35 -0000
@@ -33,196 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-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)
-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
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsdx.mk Wed Jun 28 21:38:06 2006
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsd.mk Wed Jun 28 21:50:16 2006
RCS file: solenv/inc/unxfbsd.mk
diff -N solenv/inc/unxfbsd.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsd.mk 8 Jul 2006 03:41:38 -0000 1.1.2.2
@@ -0,0 +1,238 @@
+#*************************************************************************
+#
@ -464,7 +195,7 @@ diff -u -r1.21 unxfbsdi.mk
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@ -616,3 +347,276 @@ diff -u -r1.21 unxfbsdi.mk
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.22
retrieving revision 1.21.16.3
diff -u -p -r1.22 -r1.21.16.3
--- solenv/inc/unxfbsdi.mk 5 Jul 2006 22:01:09 -0000 1.22
+++ solenv/inc/unxfbsdi.mk 8 Jul 2006 04:06:30 -0000 1.21.16.3
@@ -33,196 +33,15 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-fmessage-length=0 -c
-
-# 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)
-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
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
-
Index: solenv/inc/unxfbsdx.mk
===================================================================
RCS file: solenv/inc/unxfbsdx.mk
diff -N solenv/inc/unxfbsdx.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsdx.mk 1 Jul 2006 06:04:01 -0000 1.1.2.1
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

519
editors/openoffice-3-devel/files/patch-i66666
View file

@ -1,6 +1,3 @@
it also includes the following patch
http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
from i66686 (dupe of i66666)
Index: tools/inc/solar.h
===================================================================
RCS file: /cvs/util/tools/inc/solar.h,v
@ -19,519 +16,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() )

21
editors/openoffice-3-devel/files/patch-i66726
View file

@ -1,21 +0,0 @@
Index: tools/source/inet/inetmsg.cxx
===================================================================
RCS file: /cvs/util/tools/source/inet/inetmsg.cxx,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- tools/source/inet/inetmsg.cxx 19 Jun 2006 13:46:21 -0000 1.8
+++ tools/source/inet/inetmsg.cxx 27 Jun 2006 11:30:46 -0000 1.8.6.1
@@ -1390,9 +1390,11 @@
// Generate a unique boundary from current time.
sal_Char sTail[16 + 1];
Time aCurTime;
+ sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture
+ nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32;
sprintf (sTail, "%08X%08X",
static_cast< unsigned int >(aCurTime.GetTime()),
- reinterpret_cast< unsigned int >(this));
+ static_cast< unsigned int >(nThis));
m_aBoundary = "------------_4D48";
m_aBoundary += sTail;

26
editors/openoffice-3-devel/files/patch-i66727
View file

@ -1,26 +0,0 @@
Index: sot/source/sdstor/ucbstorage.cxx
===================================================================
RCS file: /cvs/util/sot/source/sdstor/ucbstorage.cxx,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- sot/source/sdstor/ucbstorage.cxx 20 Jun 2006 05:56:00 -0000 1.90
+++ sot/source/sdstor/ucbstorage.cxx 27 Jun 2006 10:01:10 -0000 1.90.2.1
@@ -554,7 +554,7 @@
// this class is close to be unusable
// since it can not read and write
using SvStream::SetError;
- void SetError( long nError );
+ void SetError( sal_uInt32 nError );
void PrepareCachedForReopen( StreamMode nMode );
};
@@ -1216,7 +1216,7 @@
m_bCommited = TRUE;
}
-void UCBStorageStream_Impl::SetError( long nErr )
+void UCBStorageStream_Impl::SetError( sal_uInt32 nErr )
{
if ( !m_nError )
{

17
editors/openoffice-3-devel/files/patch-i66728
View file

@ -1,17 +0,0 @@
Index: xmloff/source/style/impastp4.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/impastp4.cxx,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- xmloff/source/style/impastp4.cxx 19 Jun 2006 18:33:22 -0000 1.17
+++ xmloff/source/style/impastp4.cxx 27 Jun 2006 13:15:34 -0000 1.17.8.1
@@ -276,7 +276,7 @@
{
OUString sName;
- sal_uInt32 nPos;
+ ULONG nPos;
XMLFamilyData_Impl aTemporary( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )

17
editors/openoffice-3-devel/files/patch-i66729
View file

@ -1,17 +0,0 @@
Index: connectivity/source/drivers/dbase/DTable.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/dbase/DTable.cxx,v
retrieving revision 1.94
retrieving revision 1.94.4.1
diff -u -r1.94 -r1.94.4.1
--- connectivity/source/drivers/dbase/DTable.cxx 20 Jun 2006 01:21:12 -0000 1.94
+++ connectivity/source/drivers/dbase/DTable.cxx 27 Jun 2006 20:00:34 -0000 1.94.4.1
@@ -2408,7 +2408,7 @@
return sal_False;
}
- ULONG nLength;
+ sal_uInt32 nLength(0);
(*m_pMemoStream) >> nLength;
if (m_aMemoHeader.db_typ == MemodBaseIV)

21
editors/openoffice-3-devel/files/patch-i66730
View file

@ -1,21 +0,0 @@
Index: automation/source/server/sta_list.cxx
===================================================================
RCS file: /cvs/util/automation/source/server/sta_list.cxx,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- automation/source/server/sta_list.cxx 20 Jun 2006 00:24:33 -0000 1.18
+++ automation/source/server/sta_list.cxx 28 Jun 2006 07:43:33 -0000 1.18.4.1
@@ -992,7 +992,11 @@
WRITEc("UId : ");
WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
WRITEc(":0x");
- WRITE(String::CreateFromInt32( sal_Int32(pBase), 16 ));
+ WRITE(
+ String::CreateFromInt64(
+ sal::static_int_cast< sal_Int64 >(
+ reinterpret_cast< sal_IntPtr >(pBase)),
+ 16 ));
WRITEc(":");
WRITE(pBase->GetQuickHelpText());
WRITEc(":");

18
editors/openoffice-3-devel/files/patch-i67138 Normal file
View file

@ -0,0 +1,18 @@
--- 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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

65
editors/openoffice-3-devel/files/patch-i67139 Normal file
View file

@ -0,0 +1,65 @@
Index: work/config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.168
diff -u -r1.168 configure.in
--- config_office/configure.in 5 Jul 2006 22:32:27 -0000 1.168
+++ config_office/configure.in 8 Jul 2006 05:14:53 -0000
@@ -1059,14 +1059,14 @@
dnl ===================================================================
dnl Check whether the chosen shell can be used.
dnl ===================================================================
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
AC_PATH_PROG(SHELLPATH, tcsh)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([tcsh not found in \$PATH])
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
AC_PATH_PROG(SHELLPATH, bash)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([bash not found in \$PATH])
Index: work/config_office/configure
===================================================================
RCS file: /cvs/tools/config_office/configure,v
retrieving revision 1.153
diff -u -r1.153 configure
--- config_office/configure 6 Jul 2006 08:51:06 -0000 1.153
+++ config_office/configure 8 Jul 2006 05:15:35 -0000
@@ -3150,7 +3183,7 @@
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
# Extract the first word of "tcsh", so it can be a program name with args.
set dummy tcsh; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3197,7 +3230,7 @@
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.107
diff -u -r1.107 set_soenv.in
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 05:23:48 -0000
@@ -1965,7 +1994,7 @@
open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n";
-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n";
+print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n";
close( OUT ) || print "Can't close $bootfile: $!";
system(`cat bootstrap.1 >> bootstrap`);
system(`chmod +x bootstrap`);

16
editors/openoffice-3-devel/files/patch-i67141 Normal file
View file

@ -0,0 +1,16 @@
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.50
diff -u -r1.50 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 5 Jul 2006 21:12:31 -0000 1.50
+++ solenv/bin/modules/installer/epmfile.pm 8 Jul 2006 22:35:58 -0000
@@ -577,7 +577,7 @@
# (saved in $installer::globals::epm_in_path) or we get the specified
# one through the environment (i.e. when --with-epm=... is specified)
- if ($ENV{'EPM'})
+ if ($ENV{'BUILD_EPM'} ne "YES")
{
if (($ENV{'EPM'} ne "") && (-x "$ENV{'EPM'}"))
{

7
editors/openoffice.org-2-devel/Makefile
View file

@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 173
MILESTONE?= 175
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060626
SNAPDATE= 20060707
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -158,9 +158,8 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${WRKDIR}/gnugcj/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
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --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
WITHOUT_MOZILLA= yes

6
editors/openoffice.org-2-devel/distinfo
View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
MD5 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 9f553671a88133b60f481d27fb19356f
SHA256 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 6a521bd2876cb234a1d28c171c5e38f738f00a7d74ea47d4f1d64bc91b0a96cc
SIZE (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 248103990
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

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

File diff suppressed because it is too large Load diff

18
editors/openoffice.org-2-devel/files/patch-i65512
View file

@ -41,21 +41,3 @@
#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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

572
editors/openoffice.org-2-devel/files/patch-i65513
View file

@ -1,6 +1,6 @@
--- config_office/set_soenv.in.orig Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Mon May 22 17:39:23 2006
@@ -320,32 +320,60 @@
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 03:12:23 -0000 1.105.6.2
@@ -313,32 +313,60 @@ elsif ( $platform =~ m/netbsd/ )
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
@ -72,7 +72,7 @@
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -1294,6 +1322,7 @@
@@ -1296,6 +1324,7 @@ if ($platform =~ m/linux-gnu/)
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
@ -85,10 +85,11 @@ Index: solenv/inc/unx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unx.mk,v
retrieving revision 1.32
diff -u -r1.32 unx.mk
retrieving revision 1.32.158.1
diff -u -p -r1.32 -r1.32.158.1
--- solenv/inc/unx.mk 3 Feb 2006 17:33:26 -0000 1.32
+++ solenv/inc/unx.mk 27 Jun 2006 01:52:09 -0000
@@ -155,11 +155,10 @@
+++ solenv/inc/unx.mk 1 Jul 2006 06:02:12 -0000 1.32.158.1
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
@ -97,286 +98,16 @@ diff -u -r1.32 unx.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
.ENDIF
Index: solenv/inc/unxfbsdi.mk
Index: solenv/inc/unxfbsd.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.21
diff -u -r1.21 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 19 Jun 2006 17:13:50 -0000 1.21
+++ solenv/inc/unxfbsdi.mk 27 Jun 2006 01:52:35 -0000
@@ -33,196 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-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)
-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
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsdx.mk Wed Jun 28 21:38:06 2006
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsd.mk Wed Jun 28 21:50:16 2006
RCS file: solenv/inc/unxfbsd.mk
diff -N solenv/inc/unxfbsd.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsd.mk 8 Jul 2006 03:41:38 -0000 1.1.2.2
@@ -0,0 +1,238 @@
+#*************************************************************************
+#
@ -464,7 +195,7 @@ diff -u -r1.21 unxfbsdi.mk
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@ -616,3 +347,276 @@ diff -u -r1.21 unxfbsdi.mk
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.22
retrieving revision 1.21.16.3
diff -u -p -r1.22 -r1.21.16.3
--- solenv/inc/unxfbsdi.mk 5 Jul 2006 22:01:09 -0000 1.22
+++ solenv/inc/unxfbsdi.mk 8 Jul 2006 04:06:30 -0000 1.21.16.3
@@ -33,196 +33,15 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-fmessage-length=0 -c
-
-# 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)
-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
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
-
Index: solenv/inc/unxfbsdx.mk
===================================================================
RCS file: solenv/inc/unxfbsdx.mk
diff -N solenv/inc/unxfbsdx.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsdx.mk 1 Jul 2006 06:04:01 -0000 1.1.2.1
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

519
editors/openoffice.org-2-devel/files/patch-i66666
View file

@ -1,6 +1,3 @@
it also includes the following patch
http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
from i66686 (dupe of i66666)
Index: tools/inc/solar.h
===================================================================
RCS file: /cvs/util/tools/inc/solar.h,v
@ -19,519 +16,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() )

21
editors/openoffice.org-2-devel/files/patch-i66726
View file

@ -1,21 +0,0 @@
Index: tools/source/inet/inetmsg.cxx
===================================================================
RCS file: /cvs/util/tools/source/inet/inetmsg.cxx,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- tools/source/inet/inetmsg.cxx 19 Jun 2006 13:46:21 -0000 1.8
+++ tools/source/inet/inetmsg.cxx 27 Jun 2006 11:30:46 -0000 1.8.6.1
@@ -1390,9 +1390,11 @@
// Generate a unique boundary from current time.
sal_Char sTail[16 + 1];
Time aCurTime;
+ sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture
+ nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32;
sprintf (sTail, "%08X%08X",
static_cast< unsigned int >(aCurTime.GetTime()),
- reinterpret_cast< unsigned int >(this));
+ static_cast< unsigned int >(nThis));
m_aBoundary = "------------_4D48";
m_aBoundary += sTail;

26
editors/openoffice.org-2-devel/files/patch-i66727
View file

@ -1,26 +0,0 @@
Index: sot/source/sdstor/ucbstorage.cxx
===================================================================
RCS file: /cvs/util/sot/source/sdstor/ucbstorage.cxx,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- sot/source/sdstor/ucbstorage.cxx 20 Jun 2006 05:56:00 -0000 1.90
+++ sot/source/sdstor/ucbstorage.cxx 27 Jun 2006 10:01:10 -0000 1.90.2.1
@@ -554,7 +554,7 @@
// this class is close to be unusable
// since it can not read and write
using SvStream::SetError;
- void SetError( long nError );
+ void SetError( sal_uInt32 nError );
void PrepareCachedForReopen( StreamMode nMode );
};
@@ -1216,7 +1216,7 @@
m_bCommited = TRUE;
}
-void UCBStorageStream_Impl::SetError( long nErr )
+void UCBStorageStream_Impl::SetError( sal_uInt32 nErr )
{
if ( !m_nError )
{

17
editors/openoffice.org-2-devel/files/patch-i66728
View file

@ -1,17 +0,0 @@
Index: xmloff/source/style/impastp4.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/impastp4.cxx,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- xmloff/source/style/impastp4.cxx 19 Jun 2006 18:33:22 -0000 1.17
+++ xmloff/source/style/impastp4.cxx 27 Jun 2006 13:15:34 -0000 1.17.8.1
@@ -276,7 +276,7 @@
{
OUString sName;
- sal_uInt32 nPos;
+ ULONG nPos;
XMLFamilyData_Impl aTemporary( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )

17
editors/openoffice.org-2-devel/files/patch-i66729
View file

@ -1,17 +0,0 @@
Index: connectivity/source/drivers/dbase/DTable.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/dbase/DTable.cxx,v
retrieving revision 1.94
retrieving revision 1.94.4.1
diff -u -r1.94 -r1.94.4.1
--- connectivity/source/drivers/dbase/DTable.cxx 20 Jun 2006 01:21:12 -0000 1.94
+++ connectivity/source/drivers/dbase/DTable.cxx 27 Jun 2006 20:00:34 -0000 1.94.4.1
@@ -2408,7 +2408,7 @@
return sal_False;
}
- ULONG nLength;
+ sal_uInt32 nLength(0);
(*m_pMemoStream) >> nLength;
if (m_aMemoHeader.db_typ == MemodBaseIV)

21
editors/openoffice.org-2-devel/files/patch-i66730
View file

@ -1,21 +0,0 @@
Index: automation/source/server/sta_list.cxx
===================================================================
RCS file: /cvs/util/automation/source/server/sta_list.cxx,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- automation/source/server/sta_list.cxx 20 Jun 2006 00:24:33 -0000 1.18
+++ automation/source/server/sta_list.cxx 28 Jun 2006 07:43:33 -0000 1.18.4.1
@@ -992,7 +992,11 @@
WRITEc("UId : ");
WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
WRITEc(":0x");
- WRITE(String::CreateFromInt32( sal_Int32(pBase), 16 ));
+ WRITE(
+ String::CreateFromInt64(
+ sal::static_int_cast< sal_Int64 >(
+ reinterpret_cast< sal_IntPtr >(pBase)),
+ 16 ));
WRITEc(":");
WRITE(pBase->GetQuickHelpText());
WRITEc(":");

18
editors/openoffice.org-2-devel/files/patch-i67138 Normal file
View file

@ -0,0 +1,18 @@
--- 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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

65
editors/openoffice.org-2-devel/files/patch-i67139 Normal file
View file

@ -0,0 +1,65 @@
Index: work/config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.168
diff -u -r1.168 configure.in
--- config_office/configure.in 5 Jul 2006 22:32:27 -0000 1.168
+++ config_office/configure.in 8 Jul 2006 05:14:53 -0000
@@ -1059,14 +1059,14 @@
dnl ===================================================================
dnl Check whether the chosen shell can be used.
dnl ===================================================================
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
AC_PATH_PROG(SHELLPATH, tcsh)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([tcsh not found in \$PATH])
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
AC_PATH_PROG(SHELLPATH, bash)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([bash not found in \$PATH])
Index: work/config_office/configure
===================================================================
RCS file: /cvs/tools/config_office/configure,v
retrieving revision 1.153
diff -u -r1.153 configure
--- config_office/configure 6 Jul 2006 08:51:06 -0000 1.153
+++ config_office/configure 8 Jul 2006 05:15:35 -0000
@@ -3150,7 +3183,7 @@
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
# Extract the first word of "tcsh", so it can be a program name with args.
set dummy tcsh; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3197,7 +3230,7 @@
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.107
diff -u -r1.107 set_soenv.in
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 05:23:48 -0000
@@ -1965,7 +1994,7 @@
open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n";
-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n";
+print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n";
close( OUT ) || print "Can't close $bootfile: $!";
system(`cat bootstrap.1 >> bootstrap`);
system(`chmod +x bootstrap`);

16
editors/openoffice.org-2-devel/files/patch-i67141 Normal file
View file

@ -0,0 +1,16 @@
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.50
diff -u -r1.50 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 5 Jul 2006 21:12:31 -0000 1.50
+++ solenv/bin/modules/installer/epmfile.pm 8 Jul 2006 22:35:58 -0000
@@ -577,7 +577,7 @@
# (saved in $installer::globals::epm_in_path) or we get the specified
# one through the environment (i.e. when --with-epm=... is specified)
- if ($ENV{'EPM'})
+ if ($ENV{'BUILD_EPM'} ne "YES")
{
if (($ENV{'EPM'} ne "") && (-x "$ENV{'EPM'}"))
{

7
editors/openoffice.org-2.0-devel/Makefile
View file

@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 173
MILESTONE?= 175
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060626
SNAPDATE= 20060707
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -158,9 +158,8 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${WRKDIR}/gnugcj/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
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --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
WITHOUT_MOZILLA= yes

6
editors/openoffice.org-2.0-devel/distinfo
View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
MD5 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 9f553671a88133b60f481d27fb19356f
SHA256 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 6a521bd2876cb234a1d28c171c5e38f738f00a7d74ea47d4f1d64bc91b0a96cc
SIZE (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 248103990
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

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

File diff suppressed because it is too large Load diff

18
editors/openoffice.org-2.0-devel/files/patch-i65512
View file

@ -41,21 +41,3 @@
#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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

572
editors/openoffice.org-2.0-devel/files/patch-i65513
View file

@ -1,6 +1,6 @@
--- config_office/set_soenv.in.orig Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Mon May 22 17:39:23 2006
@@ -320,32 +320,60 @@
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 03:12:23 -0000 1.105.6.2
@@ -313,32 +313,60 @@ elsif ( $platform =~ m/netbsd/ )
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
@ -72,7 +72,7 @@
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -1294,6 +1322,7 @@
@@ -1296,6 +1324,7 @@ if ($platform =~ m/linux-gnu/)
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
@ -85,10 +85,11 @@ Index: solenv/inc/unx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unx.mk,v
retrieving revision 1.32
diff -u -r1.32 unx.mk
retrieving revision 1.32.158.1
diff -u -p -r1.32 -r1.32.158.1
--- solenv/inc/unx.mk 3 Feb 2006 17:33:26 -0000 1.32
+++ solenv/inc/unx.mk 27 Jun 2006 01:52:09 -0000
@@ -155,11 +155,10 @@
+++ solenv/inc/unx.mk 1 Jul 2006 06:02:12 -0000 1.32.158.1
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
@ -97,286 +98,16 @@ diff -u -r1.32 unx.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
.ENDIF
Index: solenv/inc/unxfbsdi.mk
Index: solenv/inc/unxfbsd.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.21
diff -u -r1.21 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 19 Jun 2006 17:13:50 -0000 1.21
+++ solenv/inc/unxfbsdi.mk 27 Jun 2006 01:52:35 -0000
@@ -33,196 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-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)
-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
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsdx.mk Wed Jun 28 21:38:06 2006
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsd.mk Wed Jun 28 21:50:16 2006
RCS file: solenv/inc/unxfbsd.mk
diff -N solenv/inc/unxfbsd.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsd.mk 8 Jul 2006 03:41:38 -0000 1.1.2.2
@@ -0,0 +1,238 @@
+#*************************************************************************
+#
@ -464,7 +195,7 @@ diff -u -r1.21 unxfbsdi.mk
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@ -616,3 +347,276 @@ diff -u -r1.21 unxfbsdi.mk
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.22
retrieving revision 1.21.16.3
diff -u -p -r1.22 -r1.21.16.3
--- solenv/inc/unxfbsdi.mk 5 Jul 2006 22:01:09 -0000 1.22
+++ solenv/inc/unxfbsdi.mk 8 Jul 2006 04:06:30 -0000 1.21.16.3
@@ -33,196 +33,15 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-fmessage-length=0 -c
-
-# 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)
-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
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
-
Index: solenv/inc/unxfbsdx.mk
===================================================================
RCS file: solenv/inc/unxfbsdx.mk
diff -N solenv/inc/unxfbsdx.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsdx.mk 1 Jul 2006 06:04:01 -0000 1.1.2.1
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

519
editors/openoffice.org-2.0-devel/files/patch-i66666
View file

@ -1,6 +1,3 @@
it also includes the following patch
http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
from i66686 (dupe of i66666)
Index: tools/inc/solar.h
===================================================================
RCS file: /cvs/util/tools/inc/solar.h,v
@ -19,519 +16,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() )

21
editors/openoffice.org-2.0-devel/files/patch-i66726
View file

@ -1,21 +0,0 @@
Index: tools/source/inet/inetmsg.cxx
===================================================================
RCS file: /cvs/util/tools/source/inet/inetmsg.cxx,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- tools/source/inet/inetmsg.cxx 19 Jun 2006 13:46:21 -0000 1.8
+++ tools/source/inet/inetmsg.cxx 27 Jun 2006 11:30:46 -0000 1.8.6.1
@@ -1390,9 +1390,11 @@
// Generate a unique boundary from current time.
sal_Char sTail[16 + 1];
Time aCurTime;
+ sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture
+ nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32;
sprintf (sTail, "%08X%08X",
static_cast< unsigned int >(aCurTime.GetTime()),
- reinterpret_cast< unsigned int >(this));
+ static_cast< unsigned int >(nThis));
m_aBoundary = "------------_4D48";
m_aBoundary += sTail;

26
editors/openoffice.org-2.0-devel/files/patch-i66727
View file

@ -1,26 +0,0 @@
Index: sot/source/sdstor/ucbstorage.cxx
===================================================================
RCS file: /cvs/util/sot/source/sdstor/ucbstorage.cxx,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- sot/source/sdstor/ucbstorage.cxx 20 Jun 2006 05:56:00 -0000 1.90
+++ sot/source/sdstor/ucbstorage.cxx 27 Jun 2006 10:01:10 -0000 1.90.2.1
@@ -554,7 +554,7 @@
// this class is close to be unusable
// since it can not read and write
using SvStream::SetError;
- void SetError( long nError );
+ void SetError( sal_uInt32 nError );
void PrepareCachedForReopen( StreamMode nMode );
};
@@ -1216,7 +1216,7 @@
m_bCommited = TRUE;
}
-void UCBStorageStream_Impl::SetError( long nErr )
+void UCBStorageStream_Impl::SetError( sal_uInt32 nErr )
{
if ( !m_nError )
{

17
editors/openoffice.org-2.0-devel/files/patch-i66728
View file

@ -1,17 +0,0 @@
Index: xmloff/source/style/impastp4.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/impastp4.cxx,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- xmloff/source/style/impastp4.cxx 19 Jun 2006 18:33:22 -0000 1.17
+++ xmloff/source/style/impastp4.cxx 27 Jun 2006 13:15:34 -0000 1.17.8.1
@@ -276,7 +276,7 @@
{
OUString sName;
- sal_uInt32 nPos;
+ ULONG nPos;
XMLFamilyData_Impl aTemporary( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )

17
editors/openoffice.org-2.0-devel/files/patch-i66729
View file

@ -1,17 +0,0 @@
Index: connectivity/source/drivers/dbase/DTable.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/dbase/DTable.cxx,v
retrieving revision 1.94
retrieving revision 1.94.4.1
diff -u -r1.94 -r1.94.4.1
--- connectivity/source/drivers/dbase/DTable.cxx 20 Jun 2006 01:21:12 -0000 1.94
+++ connectivity/source/drivers/dbase/DTable.cxx 27 Jun 2006 20:00:34 -0000 1.94.4.1
@@ -2408,7 +2408,7 @@
return sal_False;
}
- ULONG nLength;
+ sal_uInt32 nLength(0);
(*m_pMemoStream) >> nLength;
if (m_aMemoHeader.db_typ == MemodBaseIV)

21
editors/openoffice.org-2.0-devel/files/patch-i66730
View file

@ -1,21 +0,0 @@
Index: automation/source/server/sta_list.cxx
===================================================================
RCS file: /cvs/util/automation/source/server/sta_list.cxx,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- automation/source/server/sta_list.cxx 20 Jun 2006 00:24:33 -0000 1.18
+++ automation/source/server/sta_list.cxx 28 Jun 2006 07:43:33 -0000 1.18.4.1
@@ -992,7 +992,11 @@
WRITEc("UId : ");
WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
WRITEc(":0x");
- WRITE(String::CreateFromInt32( sal_Int32(pBase), 16 ));
+ WRITE(
+ String::CreateFromInt64(
+ sal::static_int_cast< sal_Int64 >(
+ reinterpret_cast< sal_IntPtr >(pBase)),
+ 16 ));
WRITEc(":");
WRITE(pBase->GetQuickHelpText());
WRITEc(":");

18
editors/openoffice.org-2.0-devel/files/patch-i67138 Normal file
View file

@ -0,0 +1,18 @@
--- 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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

65
editors/openoffice.org-2.0-devel/files/patch-i67139 Normal file
View file

@ -0,0 +1,65 @@
Index: work/config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.168
diff -u -r1.168 configure.in
--- config_office/configure.in 5 Jul 2006 22:32:27 -0000 1.168
+++ config_office/configure.in 8 Jul 2006 05:14:53 -0000
@@ -1059,14 +1059,14 @@
dnl ===================================================================
dnl Check whether the chosen shell can be used.
dnl ===================================================================
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
AC_PATH_PROG(SHELLPATH, tcsh)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([tcsh not found in \$PATH])
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
AC_PATH_PROG(SHELLPATH, bash)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([bash not found in \$PATH])
Index: work/config_office/configure
===================================================================
RCS file: /cvs/tools/config_office/configure,v
retrieving revision 1.153
diff -u -r1.153 configure
--- config_office/configure 6 Jul 2006 08:51:06 -0000 1.153
+++ config_office/configure 8 Jul 2006 05:15:35 -0000
@@ -3150,7 +3183,7 @@
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
# Extract the first word of "tcsh", so it can be a program name with args.
set dummy tcsh; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3197,7 +3230,7 @@
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.107
diff -u -r1.107 set_soenv.in
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 05:23:48 -0000
@@ -1965,7 +1994,7 @@
open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n";
-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n";
+print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n";
close( OUT ) || print "Can't close $bootfile: $!";
system(`cat bootstrap.1 >> bootstrap`);
system(`chmod +x bootstrap`);

16
editors/openoffice.org-2.0-devel/files/patch-i67141 Normal file
View file

@ -0,0 +1,16 @@
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.50
diff -u -r1.50 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 5 Jul 2006 21:12:31 -0000 1.50
+++ solenv/bin/modules/installer/epmfile.pm 8 Jul 2006 22:35:58 -0000
@@ -577,7 +577,7 @@
# (saved in $installer::globals::epm_in_path) or we get the specified
# one through the environment (i.e. when --with-epm=... is specified)
- if ($ENV{'EPM'})
+ if ($ENV{'BUILD_EPM'} ne "YES")
{
if (($ENV{'EPM'} ne "") && (-x "$ENV{'EPM'}"))
{

7
editors/openoffice.org-3-devel/Makefile
View file

@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 173
MILESTONE?= 175
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060626
SNAPDATE= 20060707
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -158,9 +158,8 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${WRKDIR}/gnugcj/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
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --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
WITHOUT_MOZILLA= yes

6
editors/openoffice.org-3-devel/distinfo
View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
MD5 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 9f553671a88133b60f481d27fb19356f
SHA256 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 6a521bd2876cb234a1d28c171c5e38f738f00a7d74ea47d4f1d64bc91b0a96cc
SIZE (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 248103990
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

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

File diff suppressed because it is too large Load diff

18
editors/openoffice.org-3-devel/files/patch-i65512
View file

@ -41,21 +41,3 @@
#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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

572
editors/openoffice.org-3-devel/files/patch-i65513
View file

@ -1,6 +1,6 @@
--- config_office/set_soenv.in.orig Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Mon May 22 17:39:23 2006
@@ -320,32 +320,60 @@
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 03:12:23 -0000 1.105.6.2
@@ -313,32 +313,60 @@ elsif ( $platform =~ m/netbsd/ )
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
@ -72,7 +72,7 @@
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -1294,6 +1322,7 @@
@@ -1296,6 +1324,7 @@ if ($platform =~ m/linux-gnu/)
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
@ -85,10 +85,11 @@ Index: solenv/inc/unx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unx.mk,v
retrieving revision 1.32
diff -u -r1.32 unx.mk
retrieving revision 1.32.158.1
diff -u -p -r1.32 -r1.32.158.1
--- solenv/inc/unx.mk 3 Feb 2006 17:33:26 -0000 1.32
+++ solenv/inc/unx.mk 27 Jun 2006 01:52:09 -0000
@@ -155,11 +155,10 @@
+++ solenv/inc/unx.mk 1 Jul 2006 06:02:12 -0000 1.32.158.1
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
@ -97,286 +98,16 @@ diff -u -r1.32 unx.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
.ENDIF
Index: solenv/inc/unxfbsdi.mk
Index: solenv/inc/unxfbsd.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.21
diff -u -r1.21 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 19 Jun 2006 17:13:50 -0000 1.21
+++ solenv/inc/unxfbsdi.mk 27 Jun 2006 01:52:35 -0000
@@ -33,196 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-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)
-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
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsdx.mk Wed Jun 28 21:38:06 2006
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsd.mk Wed Jun 28 21:50:16 2006
RCS file: solenv/inc/unxfbsd.mk
diff -N solenv/inc/unxfbsd.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsd.mk 8 Jul 2006 03:41:38 -0000 1.1.2.2
@@ -0,0 +1,238 @@
+#*************************************************************************
+#
@ -464,7 +195,7 @@ diff -u -r1.21 unxfbsdi.mk
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@ -616,3 +347,276 @@ diff -u -r1.21 unxfbsdi.mk
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.22
retrieving revision 1.21.16.3
diff -u -p -r1.22 -r1.21.16.3
--- solenv/inc/unxfbsdi.mk 5 Jul 2006 22:01:09 -0000 1.22
+++ solenv/inc/unxfbsdi.mk 8 Jul 2006 04:06:30 -0000 1.21.16.3
@@ -33,196 +33,15 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-fmessage-length=0 -c
-
-# 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)
-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
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
-
Index: solenv/inc/unxfbsdx.mk
===================================================================
RCS file: solenv/inc/unxfbsdx.mk
diff -N solenv/inc/unxfbsdx.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsdx.mk 1 Jul 2006 06:04:01 -0000 1.1.2.1
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

519
editors/openoffice.org-3-devel/files/patch-i66666
View file

@ -1,6 +1,3 @@
it also includes the following patch
http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
from i66686 (dupe of i66666)
Index: tools/inc/solar.h
===================================================================
RCS file: /cvs/util/tools/inc/solar.h,v
@ -19,519 +16,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() )

21
editors/openoffice.org-3-devel/files/patch-i66726
View file

@ -1,21 +0,0 @@
Index: tools/source/inet/inetmsg.cxx
===================================================================
RCS file: /cvs/util/tools/source/inet/inetmsg.cxx,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- tools/source/inet/inetmsg.cxx 19 Jun 2006 13:46:21 -0000 1.8
+++ tools/source/inet/inetmsg.cxx 27 Jun 2006 11:30:46 -0000 1.8.6.1
@@ -1390,9 +1390,11 @@
// Generate a unique boundary from current time.
sal_Char sTail[16 + 1];
Time aCurTime;
+ sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture
+ nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32;
sprintf (sTail, "%08X%08X",
static_cast< unsigned int >(aCurTime.GetTime()),
- reinterpret_cast< unsigned int >(this));
+ static_cast< unsigned int >(nThis));
m_aBoundary = "------------_4D48";
m_aBoundary += sTail;

26
editors/openoffice.org-3-devel/files/patch-i66727
View file

@ -1,26 +0,0 @@
Index: sot/source/sdstor/ucbstorage.cxx
===================================================================
RCS file: /cvs/util/sot/source/sdstor/ucbstorage.cxx,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- sot/source/sdstor/ucbstorage.cxx 20 Jun 2006 05:56:00 -0000 1.90
+++ sot/source/sdstor/ucbstorage.cxx 27 Jun 2006 10:01:10 -0000 1.90.2.1
@@ -554,7 +554,7 @@
// this class is close to be unusable
// since it can not read and write
using SvStream::SetError;
- void SetError( long nError );
+ void SetError( sal_uInt32 nError );
void PrepareCachedForReopen( StreamMode nMode );
};
@@ -1216,7 +1216,7 @@
m_bCommited = TRUE;
}
-void UCBStorageStream_Impl::SetError( long nErr )
+void UCBStorageStream_Impl::SetError( sal_uInt32 nErr )
{
if ( !m_nError )
{

17
editors/openoffice.org-3-devel/files/patch-i66728
View file

@ -1,17 +0,0 @@
Index: xmloff/source/style/impastp4.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/impastp4.cxx,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- xmloff/source/style/impastp4.cxx 19 Jun 2006 18:33:22 -0000 1.17
+++ xmloff/source/style/impastp4.cxx 27 Jun 2006 13:15:34 -0000 1.17.8.1
@@ -276,7 +276,7 @@
{
OUString sName;
- sal_uInt32 nPos;
+ ULONG nPos;
XMLFamilyData_Impl aTemporary( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )

17
editors/openoffice.org-3-devel/files/patch-i66729
View file

@ -1,17 +0,0 @@
Index: connectivity/source/drivers/dbase/DTable.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/dbase/DTable.cxx,v
retrieving revision 1.94
retrieving revision 1.94.4.1
diff -u -r1.94 -r1.94.4.1
--- connectivity/source/drivers/dbase/DTable.cxx 20 Jun 2006 01:21:12 -0000 1.94
+++ connectivity/source/drivers/dbase/DTable.cxx 27 Jun 2006 20:00:34 -0000 1.94.4.1
@@ -2408,7 +2408,7 @@
return sal_False;
}
- ULONG nLength;
+ sal_uInt32 nLength(0);
(*m_pMemoStream) >> nLength;
if (m_aMemoHeader.db_typ == MemodBaseIV)

21
editors/openoffice.org-3-devel/files/patch-i66730
View file

@ -1,21 +0,0 @@
Index: automation/source/server/sta_list.cxx
===================================================================
RCS file: /cvs/util/automation/source/server/sta_list.cxx,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- automation/source/server/sta_list.cxx 20 Jun 2006 00:24:33 -0000 1.18
+++ automation/source/server/sta_list.cxx 28 Jun 2006 07:43:33 -0000 1.18.4.1
@@ -992,7 +992,11 @@
WRITEc("UId : ");
WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
WRITEc(":0x");
- WRITE(String::CreateFromInt32( sal_Int32(pBase), 16 ));
+ WRITE(
+ String::CreateFromInt64(
+ sal::static_int_cast< sal_Int64 >(
+ reinterpret_cast< sal_IntPtr >(pBase)),
+ 16 ));
WRITEc(":");
WRITE(pBase->GetQuickHelpText());
WRITEc(":");

18
editors/openoffice.org-3-devel/files/patch-i67138 Normal file
View file

@ -0,0 +1,18 @@
--- 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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

65
editors/openoffice.org-3-devel/files/patch-i67139 Normal file
View file

@ -0,0 +1,65 @@
Index: work/config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.168
diff -u -r1.168 configure.in
--- config_office/configure.in 5 Jul 2006 22:32:27 -0000 1.168
+++ config_office/configure.in 8 Jul 2006 05:14:53 -0000
@@ -1059,14 +1059,14 @@
dnl ===================================================================
dnl Check whether the chosen shell can be used.
dnl ===================================================================
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
AC_PATH_PROG(SHELLPATH, tcsh)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([tcsh not found in \$PATH])
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
AC_PATH_PROG(SHELLPATH, bash)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([bash not found in \$PATH])
Index: work/config_office/configure
===================================================================
RCS file: /cvs/tools/config_office/configure,v
retrieving revision 1.153
diff -u -r1.153 configure
--- config_office/configure 6 Jul 2006 08:51:06 -0000 1.153
+++ config_office/configure 8 Jul 2006 05:15:35 -0000
@@ -3150,7 +3183,7 @@
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
# Extract the first word of "tcsh", so it can be a program name with args.
set dummy tcsh; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3197,7 +3230,7 @@
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.107
diff -u -r1.107 set_soenv.in
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 05:23:48 -0000
@@ -1965,7 +1994,7 @@
open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n";
-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n";
+print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n";
close( OUT ) || print "Can't close $bootfile: $!";
system(`cat bootstrap.1 >> bootstrap`);
system(`chmod +x bootstrap`);

16
editors/openoffice.org-3-devel/files/patch-i67141 Normal file
View file

@ -0,0 +1,16 @@
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.50
diff -u -r1.50 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 5 Jul 2006 21:12:31 -0000 1.50
+++ solenv/bin/modules/installer/epmfile.pm 8 Jul 2006 22:35:58 -0000
@@ -577,7 +577,7 @@
# (saved in $installer::globals::epm_in_path) or we get the specified
# one through the environment (i.e. when --with-epm=... is specified)
- if ($ENV{'EPM'})
+ if ($ENV{'BUILD_EPM'} ne "YES")
{
if (($ENV{'EPM'} ne "") && (-x "$ENV{'EPM'}"))
{

7
editors/openoffice.org-vcltesttool/Makefile
View file

@ -73,9 +73,9 @@ IGNORE= install lang/perl5.8 then try again
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 173
MILESTONE?= 175
OOOTAG?= SRC680_m${MILESTONE}
SNAPDATE= 20060626
SNAPDATE= 20060707
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -158,9 +158,8 @@ NUMOFPROCESSES?= 1
CONFIGURE_ENV+= PATH="${WRKDIR}/gnugcj/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
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --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
WITHOUT_MOZILLA= yes

6
editors/openoffice.org-vcltesttool/distinfo
View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8922278010673990b2d51b3a0b7aa3c
SHA256 (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = b8d456b942d918088a3506051edf1c8c596d59586ebb78a95a566a53893c4d92
SIZE (openoffice.org2.0/OOo_SRC680_m173_source.tar.bz2) = 248052856
MD5 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 9f553671a88133b60f481d27fb19356f
SHA256 (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 6a521bd2876cb234a1d28c171c5e38f738f00a7d74ea47d4f1d64bc91b0a96cc
SIZE (openoffice.org2.0/OOo_SRC680_m175_source.tar.bz2) = 248103990
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917

4767
editors/openoffice.org-vcltesttool/files/patch-i64815
View file

File diff suppressed because it is too large Load diff

18
editors/openoffice.org-vcltesttool/files/patch-i65512
View file

@ -41,21 +41,3 @@
#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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

572
editors/openoffice.org-vcltesttool/files/patch-i65513
View file

@ -1,6 +1,6 @@
--- config_office/set_soenv.in.orig Mon May 8 11:55:43 2006
+++ config_office/set_soenv.in Mon May 22 17:39:23 2006
@@ -320,32 +320,60 @@
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 03:12:23 -0000 1.105.6.2
@@ -313,32 +313,60 @@ elsif ( $platform =~ m/netbsd/ )
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
@ -72,7 +72,7 @@
}
elsif ( $platform =~ m/linux-gnu/ )
{
@@ -1294,6 +1322,7 @@
@@ -1296,6 +1324,7 @@ if ($platform =~ m/linux-gnu/)
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
@ -85,10 +85,11 @@ Index: solenv/inc/unx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unx.mk,v
retrieving revision 1.32
diff -u -r1.32 unx.mk
retrieving revision 1.32.158.1
diff -u -p -r1.32 -r1.32.158.1
--- solenv/inc/unx.mk 3 Feb 2006 17:33:26 -0000 1.32
+++ solenv/inc/unx.mk 27 Jun 2006 01:52:09 -0000
@@ -155,11 +155,10 @@
+++ solenv/inc/unx.mk 1 Jul 2006 06:02:12 -0000 1.32.158.1
@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
@ -97,286 +98,16 @@ diff -u -r1.32 unx.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
.ENDIF
Index: solenv/inc/unxfbsdi.mk
Index: solenv/inc/unxfbsd.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.21
diff -u -r1.21 unxfbsdi.mk
--- solenv/inc/unxfbsdi.mk 19 Jun 2006 17:13:50 -0000 1.21
+++ solenv/inc/unxfbsdi.mk 27 Jun 2006 01:52:35 -0000
@@ -33,196 +33,23 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-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)
-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
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsdx.mk Wed Jun 28 21:38:06 2006
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx
--- /dev/null Wed Jun 28 21:44:00 2006
+++ solenv/inc/unxfbsd.mk Wed Jun 28 21:50:16 2006
RCS file: solenv/inc/unxfbsd.mk
diff -N solenv/inc/unxfbsd.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsd.mk 8 Jul 2006 03:41:38 -0000 1.1.2.2
@@ -0,0 +1,238 @@
+#*************************************************************************
+#
@ -464,7 +195,7 @@ diff -u -r1.21 unxfbsdi.mk
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@ -616,3 +347,276 @@ diff -u -r1.21 unxfbsdi.mk
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.22
retrieving revision 1.21.16.3
diff -u -p -r1.22 -r1.21.16.3
--- solenv/inc/unxfbsdi.mk 5 Jul 2006 22:01:09 -0000 1.22
+++ solenv/inc/unxfbsdi.mk 8 Jul 2006 04:06:30 -0000 1.21.16.3
@@ -33,196 +33,15 @@
#
#*************************************************************************
-# mk file for unxfbsdi
-ASM=
-AFLAGS=
-
-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
+#
+# FreBSD/i386 specific defines
+#
+
+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+=-fmessage-length=0 -c
-
-# 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)
-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
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-Wreturn-type
-.IF "$(PRODUCT)"!=""
-CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
-.ENDIF
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-# 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
-
Index: solenv/inc/unxfbsdx.mk
===================================================================
RCS file: solenv/inc/unxfbsdx.mk
diff -N solenv/inc/unxfbsdx.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ solenv/inc/unxfbsdx.mk 1 Jul 2006 06:04:01 -0000 1.1.2.1
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx

519
editors/openoffice.org-vcltesttool/files/patch-i66666
View file

@ -1,6 +1,3 @@
it also includes the following patch
http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
from i66686 (dupe of i66666)
Index: tools/inc/solar.h
===================================================================
RCS file: /cvs/util/tools/inc/solar.h,v
@ -19,519 +16,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() )

21
editors/openoffice.org-vcltesttool/files/patch-i66726
View file

@ -1,21 +0,0 @@
Index: tools/source/inet/inetmsg.cxx
===================================================================
RCS file: /cvs/util/tools/source/inet/inetmsg.cxx,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- tools/source/inet/inetmsg.cxx 19 Jun 2006 13:46:21 -0000 1.8
+++ tools/source/inet/inetmsg.cxx 27 Jun 2006 11:30:46 -0000 1.8.6.1
@@ -1390,9 +1390,11 @@
// Generate a unique boundary from current time.
sal_Char sTail[16 + 1];
Time aCurTime;
+ sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture
+ nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32;
sprintf (sTail, "%08X%08X",
static_cast< unsigned int >(aCurTime.GetTime()),
- reinterpret_cast< unsigned int >(this));
+ static_cast< unsigned int >(nThis));
m_aBoundary = "------------_4D48";
m_aBoundary += sTail;

26
editors/openoffice.org-vcltesttool/files/patch-i66727
View file

@ -1,26 +0,0 @@
Index: sot/source/sdstor/ucbstorage.cxx
===================================================================
RCS file: /cvs/util/sot/source/sdstor/ucbstorage.cxx,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- sot/source/sdstor/ucbstorage.cxx 20 Jun 2006 05:56:00 -0000 1.90
+++ sot/source/sdstor/ucbstorage.cxx 27 Jun 2006 10:01:10 -0000 1.90.2.1
@@ -554,7 +554,7 @@
// this class is close to be unusable
// since it can not read and write
using SvStream::SetError;
- void SetError( long nError );
+ void SetError( sal_uInt32 nError );
void PrepareCachedForReopen( StreamMode nMode );
};
@@ -1216,7 +1216,7 @@
m_bCommited = TRUE;
}
-void UCBStorageStream_Impl::SetError( long nErr )
+void UCBStorageStream_Impl::SetError( sal_uInt32 nErr )
{
if ( !m_nError )
{

17
editors/openoffice.org-vcltesttool/files/patch-i66728
View file

@ -1,17 +0,0 @@
Index: xmloff/source/style/impastp4.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/impastp4.cxx,v
retrieving revision 1.17
retrieving revision 1.17.8.1
diff -u -r1.17 -r1.17.8.1
--- xmloff/source/style/impastp4.cxx 19 Jun 2006 18:33:22 -0000 1.17
+++ xmloff/source/style/impastp4.cxx 27 Jun 2006 13:15:34 -0000 1.17.8.1
@@ -276,7 +276,7 @@
{
OUString sName;
- sal_uInt32 nPos;
+ ULONG nPos;
XMLFamilyData_Impl aTemporary( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )

17
editors/openoffice.org-vcltesttool/files/patch-i66729
View file

@ -1,17 +0,0 @@
Index: connectivity/source/drivers/dbase/DTable.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/dbase/DTable.cxx,v
retrieving revision 1.94
retrieving revision 1.94.4.1
diff -u -r1.94 -r1.94.4.1
--- connectivity/source/drivers/dbase/DTable.cxx 20 Jun 2006 01:21:12 -0000 1.94
+++ connectivity/source/drivers/dbase/DTable.cxx 27 Jun 2006 20:00:34 -0000 1.94.4.1
@@ -2408,7 +2408,7 @@
return sal_False;
}
- ULONG nLength;
+ sal_uInt32 nLength(0);
(*m_pMemoStream) >> nLength;
if (m_aMemoHeader.db_typ == MemodBaseIV)

21
editors/openoffice.org-vcltesttool/files/patch-i66730
View file

@ -1,21 +0,0 @@
Index: automation/source/server/sta_list.cxx
===================================================================
RCS file: /cvs/util/automation/source/server/sta_list.cxx,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- automation/source/server/sta_list.cxx 20 Jun 2006 00:24:33 -0000 1.18
+++ automation/source/server/sta_list.cxx 28 Jun 2006 07:43:33 -0000 1.18.4.1
@@ -992,7 +992,11 @@
WRITEc("UId : ");
WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
WRITEc(":0x");
- WRITE(String::CreateFromInt32( sal_Int32(pBase), 16 ));
+ WRITE(
+ String::CreateFromInt64(
+ sal::static_int_cast< sal_Int64 >(
+ reinterpret_cast< sal_IntPtr >(pBase)),
+ 16 ));
WRITEc(":");
WRITE(pBase->GetQuickHelpText());
WRITEc(":");

18
editors/openoffice.org-vcltesttool/files/patch-i67138 Normal file
View file

@ -0,0 +1,18 @@
--- 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 > 700016)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif

65
editors/openoffice.org-vcltesttool/files/patch-i67139 Normal file
View file

@ -0,0 +1,65 @@
Index: work/config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.168
diff -u -r1.168 configure.in
--- config_office/configure.in 5 Jul 2006 22:32:27 -0000 1.168
+++ config_office/configure.in 8 Jul 2006 05:14:53 -0000
@@ -1059,14 +1059,14 @@
dnl ===================================================================
dnl Check whether the chosen shell can be used.
dnl ===================================================================
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
AC_PATH_PROG(SHELLPATH, tcsh)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([tcsh not found in \$PATH])
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
AC_PATH_PROG(SHELLPATH, bash)
if test -z "$SHELLPATH"; then
AC_MSG_ERROR([bash not found in \$PATH])
Index: work/config_office/configure
===================================================================
RCS file: /cvs/tools/config_office/configure,v
retrieving revision 1.153
diff -u -r1.153 configure
--- config_office/configure 6 Jul 2006 08:51:06 -0000 1.153
+++ config_office/configure 8 Jul 2006 05:15:35 -0000
@@ -3150,7 +3183,7 @@
-if test "$with_use_shell" == "tcsh"; then
+if test "$with_use_shell" = "tcsh"; then
# Extract the first word of "tcsh", so it can be a program name with args.
set dummy tcsh; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3197,7 +3230,7 @@
else
SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
fi
-elif test "$with_use_shell" == "bash"; then
+elif test "$with_use_shell" = "bash"; then
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.107
diff -u -r1.107 set_soenv.in
--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
+++ config_office/set_soenv.in 8 Jul 2006 05:23:48 -0000
@@ -1965,7 +1994,7 @@
open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n";
-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n";
+print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n";
close( OUT ) || print "Can't close $bootfile: $!";
system(`cat bootstrap.1 >> bootstrap`);
system(`chmod +x bootstrap`);

16
editors/openoffice.org-vcltesttool/files/patch-i67141 Normal file
View file

@ -0,0 +1,16 @@
Index: solenv/bin/modules/installer/epmfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
retrieving revision 1.50
diff -u -r1.50 epmfile.pm
--- solenv/bin/modules/installer/epmfile.pm 5 Jul 2006 21:12:31 -0000 1.50
+++ solenv/bin/modules/installer/epmfile.pm 8 Jul 2006 22:35:58 -0000
@@ -577,7 +577,7 @@
# (saved in $installer::globals::epm_in_path) or we get the specified
# one through the environment (i.e. when --with-epm=... is specified)
- if ($ENV{'EPM'})
+ if ($ENV{'BUILD_EPM'} ne "YES")
{
if (($ENV{'EPM'} ne "") && (-x "$ENV{'EPM'}"))
{