From 45285a50da80efa82b4558c64bd9bd47ce92e35f Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sat, 27 May 2006 22:18:15 +0000 Subject: some amd64 patches --- .../openoffice.org-2.0-devel/files/cws-maho1.diff | 33 +- .../openoffice.org-2.0-devel/files/patch-i65513 | 581 +++++++++++++++++++++ .../openoffice.org-2.0-devel/files/patch-i65514 | 152 +++++- 3 files changed, 734 insertions(+), 32 deletions(-) create mode 100644 editors/openoffice.org-2.0-devel/files/patch-i65513 (limited to 'editors/openoffice.org-2.0-devel/files') diff --git a/editors/openoffice.org-2.0-devel/files/cws-maho1.diff b/editors/openoffice.org-2.0-devel/files/cws-maho1.diff index e5ca72a3de82..8362b1cdb171 100644 --- a/editors/openoffice.org-2.0-devel/files/cws-maho1.diff +++ b/editors/openoffice.org-2.0-devel/files/cws-maho1.diff @@ -143,30 +143,23 @@ diff -u -p -r1.11 -r1.11.12.1 .ELSE all: -Index: configure +Index: config_office/configure =================================================================== RCS file: /cvs/tools/config_office/configure,v -retrieving revision 1.147 -diff -u -r1.147 configure ---- config_office/configure 20 Apr 2006 13:37:25 -0000 1.147 -+++ config_office/configure 25 Apr 2006 13:11:27 -0000 -@@ -1,5 +1,5 @@ - #! /bin/sh --# From configure.in Revision . -+# From configure.in Revision: 1.163 . - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.59. - # +retrieving revision 1.149 +diff -u -r1.149 configure +--- config_office/configure 5 May 2006 11:32:59 -0000 1.149 ++++ config_office/configure 9 May 2006 22:08:51 -0000 @@ -309,7 +309,7 @@ # include #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAR JAVACMD JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAR JAVACMD JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. -@@ -7584,9 +7584,14 @@ +@@ -7705,9 +7705,14 @@ fi if test "$SOLAR_JAVA" != ""; then @@ -183,7 +176,7 @@ diff -u -r1.147 configure echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_JAVADOC+set}" = set; then -@@ -7625,12 +7630,12 @@ +@@ -7746,12 +7751,12 @@ fi else @@ -199,7 +192,7 @@ diff -u -r1.147 configure echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_JAVADOC+set}" = set; then -@@ -8079,6 +8084,59 @@ +@@ -8200,6 +8205,59 @@ fi fi @@ -259,7 +252,7 @@ diff -u -r1.147 configure -@@ -21061,9 +21119,8 @@ +@@ -21115,9 +21173,8 @@ EOF @@ -270,7 +263,7 @@ diff -u -r1.147 configure ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2" else ant_cmd="$ANT -buildfile conftest.xml 1>&2" -@@ -21090,9 +21147,9 @@ +@@ -21144,9 +21201,9 @@ ANT_HOME="" echo "Ant does not work - Some Java projects will not build!" >>warn fi @@ -281,7 +274,7 @@ diff -u -r1.147 configure if test -z "$ANT_HOME"; then ANT_HOME="NO_ANT_HOME" fi -@@ -21908,6 +21965,8 @@ +@@ -21963,6 +22020,8 @@ s,@JAVADOC@,$JAVADOC,;t t s,@AWTLIB@,$AWTLIB,;t t s,@JAVACACHE@,$JAVACACHE,;t t diff --git a/editors/openoffice.org-2.0-devel/files/patch-i65513 b/editors/openoffice.org-2.0-devel/files/patch-i65513 new file mode 100644 index 000000000000..146731b44885 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-i65513 @@ -0,0 +1,581 @@ +--- 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 @@ + $XPVERSION = "3"; + } + elsif ( $platform =~ m/freebsd/ ) +-{ print "Setting FreeBSD specific values... "; +- $outfile = "FreeBSDEnv.Set"; +- $BIG_SVX = "TRUE"; ++{ $BIG_SVX = "TRUE"; + $COM = "GCC"; + $COMPATH = '@COMPATH@'; +- $CPU = "I"; +- $CPUNAME = "INTEL"; + $CVER = "C300"; + $GUI = "UNX"; + $GUIBASE = "unx"; + $GUIENV = "sal"; + $GVER = "VCL"; +- $OUTPATH = "unxfbsd"; +- $INPATH = $OUTPATH.$PROEXT; +- $GVERDIR = $INPATH; + $OS = "FREEBSD"; + $PATH_SEPERATOR = $ps; + $XPVERSION = "3"; + $OSVERSION = '@OSVERSION@'; ++ if ($platform =~ m/^amd64/) ++ { my ( $JAVA_OS ); ++ print "Setting FreeBSD AMD64 specific values... "; ++ $outfile = "FreeBSDAMDEnv.Set"; ++ $CPU = "X"; ++ $CPUNAME = "X86_64"; ++ $OUTPATH = "unxfbsdx"; ++ $JAVA_OS = '@JAVA_HOME@'; ++ $JAVA_OS =~ s/.*\///; ++ if ($JAVA_OS =~ m/^linux/) ++ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; ++ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; ++ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; ++ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; ++ } ++ else ++ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64"; ++ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server"; ++ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; ++ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt"; ++ } ++ } ++ elsif ($platform =~ m/^i386/) ++ { print "Setting FreeBSD Intel specific values... "; ++ $outfile = "FreeBSDIntelEnv.Set"; ++ $CPU = "I"; ++ $CPUNAME = "INTEL"; ++ $OUTPATH = "unxfbsdi"; + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; + $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; +- if( @GCCVER@ >= 30401 ) { +- $CVER = "C341"; +- } ++ } ++ else ++ { print "Unsupported FreeBSD architecture: $platform \n"; ++ exit 1; ++ } ++ if( @GCCVER@ >= 30401 ) { ++ $CVER = "C341"; ++ } ++ $INPATH = $OUTPATH.$PROEXT; ++ $GVERDIR = $INPATH; + } + elsif ( $platform =~ m/linux-gnu/ ) + { +@@ -1294,6 +1322,7 @@ + { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } + elsif ($platform =~ m/netbsd/) + { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; +--- solenv/inc/unx.mk Fri May 19 13:55:04 2006 ++++ solenv/inc/unx.mk Fri May 19 13:38:42 2006 +@@ -155,10 +155,9 @@ + .INCLUDE : unxbsds.mk + .ENDIF + +-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" +-.INCLUDE : unxfbsdi.mk ++.IF "$(COM)$(OS)" == "GCCFREEBSD" ++.INCLUDE : unxfbsd.mk + .ENDIF +- + + .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM" + .INCLUDE : unxirxm3.mk +--- solenv/inc/unxfbsd.mk Fri May 19 13:13:25 2006 ++++ solenv/inc/unxfbsd.mk Fri May 19 13:52:02 2006 +@@ -0,0 +1,220 @@ ++#************************************************************************* ++# ++# OpenOffice.org - a multi-platform office productivity suite ++# ++# $RCSfile$ ++# ++# $Revision$ ++# ++# last change: $Author$ $Date$ ++# ++# The Contents of this file are made available subject to ++# the terms of GNU Lesser General Public License Version 2.1. ++# ++# ++# GNU Lesser General Public License Version 2.1 ++# ============================================= ++# Copyright 2005 by Sun Microsystems, Inc. ++# 901 San Antonio Road, Palo Alto, CA 94303, USA ++# ++# This library is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Lesser General Public ++# License version 2.1, as published by the Free Software Foundation. ++# ++# This library is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# Lesser General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public ++# License along with this library; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++#************************************************************************* ++ ++# Makefile for FreeBSD. ++ ++ASM= ++AFLAGS= ++ ++SOLAR_JAVA*=TRUE ++JAVAFLAGSDEBUG=-g ++ ++# Include arch specific makefile. ++.IF "$(CPUNAME)" == "INTEL" ++.INCLUDE : unxfbsdi.mk ++.ENDIF ++.IF "$(CPUNAME)" == "X86_64" ++.INCLUDE : unxfbsdx.mk ++.ENDIF ++ ++# filter for supressing verbose messages from linker ++#not needed at the moment ++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" ++ ++# _PTHREADS is needed for the stl ++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 ++ ++# enable visibility define in "sal/types.h" ++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" ++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE ++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" ++ ++# this is a platform with JAVA support ++.IF "$(SOLAR_JAVA)"!="" ++JAVADEF=-DSOLAR_JAVA ++.IF "$(debug)"=="" ++JAVA_RUNTIME=-ljava ++.ELSE ++JAVA_RUNTIME=-ljava_g ++.ENDIF ++.ENDIF ++ ++# name of C++ Compiler ++CXX*=g++ ++# name of C Compiler ++CC*=gcc ++.IF "$(SYSBASE)"!="" ++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include ++CXX+:=$(CFLAGS_SYSBASE) ++CC+:=$(CFLAGS_SYSBASE) ++.ENDIF # "$(SYSBASE)"!="" ++CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE) ++ ++# flags to enable build with symbols; required for crashdump feature ++.IF "$(ENABLE_SYMBOLS)"=="SMALL" ++CFLAGSENABLESYMBOLS=-g1 ++.ELSE ++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta ++ ++.ENDIF ++ ++# flags for the C++ Compiler ++CFLAGSCC= -pipe $(ARCH_FLAGS) ++# Flags for enabling exception handling ++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs ++# Flags for disabling exception handling ++CFLAGS_NO_EXCEPTIONS=-fno-exceptions ++ ++# -fpermissive should be removed as soon as possible ++CFLAGSCXX= -pipe $(ARCH_FLAGS) ++CFLAGSCXX+= -Wno-ctor-dtor-privacy ++PICSWITCH:=-fpic ++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" ++CFLAGSCXX += -fvisibility-inlines-hidden ++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" ++ ++# Compiler flags for compiling static object in single threaded environment with graphical user interface ++CFLAGSOBJGUIST= ++# Compiler flags for compiling static object in single threaded environment with character user interface ++CFLAGSOBJCUIST= ++# Compiler flags for compiling static object in multi threaded environment with graphical user interface ++CFLAGSOBJGUIMT= ++# Compiler flags for compiling static object in multi threaded environment with character user interface ++CFLAGSOBJCUIMT= ++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface ++CFLAGSSLOGUIMT=$(PICSWITCH) ++# Compiler flags for compiling shared object in multi threaded environment with character user interface ++CFLAGSSLOCUIMT=$(PICSWITCH) ++# Compiler flags for profiling ++CFLAGSPROF= ++# Compiler flags for debugging ++CFLAGSDEBUG=-g ++CFLAGSDBGUTIL= ++# Compiler flags for disabling optimizations ++CFLAGSNOOPT=-O0 ++# Compiler flags for describing the output path ++CFLAGSOUTOBJ=-o ++# Enable all warnings ++CFLAGSWALL=-Wall ++# Set default warn level ++CFLAGSDFLTWARN= ++ ++# switches for dynamic and static linking ++STATIC = -Wl,-Bstatic ++DYNAMIC = -Wl,-Bdynamic ++ ++# name of linker ++LINK*=$(CXX) ++LINKC*=$(CC) ++ ++# default linker flags ++LINKFLAGSDEFS*=#-Wl,-z,defs ++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' ++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) ++ ++# linker flags for linking applications ++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec ++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec ++ ++# linker flags for linking shared libraries ++LINKFLAGSSHLGUI= -shared ++LINKFLAGSSHLCUI= -shared ++ ++LINKFLAGSTACK= ++LINKFLAGSPROF= ++LINKFLAGSDEBUG=-g ++LINKFLAGSOPT= ++ ++# linker flags for optimization (symbol hashtable) ++# for now, applied to symbol scoped libraries, only ++LINKFLAGSOPTIMIZE*=-Wl,-O1 ++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script ++ ++SONAME_SWITCH=-Wl,-h ++ ++# Sequence of libs does matter ! ++ ++STDLIBCPP=-lstdc++ ++ ++# default objectfilenames to link ++STDOBJVCL=$(L)$/salmain.o ++STDOBJGUI= ++STDSLOGUI= ++STDOBJCUI= ++STDSLOCUI= ++ ++# libraries for linking applications ++STDLIBCUIST=-lm ++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm ++STDLIBCUIMT=$(PTHREAD_LIBS) -lm ++STDLIBGUIST=-lX11 -lm ++# libraries for linking shared libraries ++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm ++STDSHLCUIMT=$(PTHREAD_LIBS) -lm ++STDSHLGUIST=-lX11 -lXext -lm ++STDSHLCUIST=-lm ++ ++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive ++ ++.IF "$(USE_STLP_DEBUG)" != "" ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug ++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) ++.ELSE # "$(USE_STLP_DEBUG)" != "" ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc ++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) ++.ENDIF # "$(USE_STLP_DEBUG)" != "" ++ ++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) ++ ++# name of library manager ++LIBMGR=ar ++LIBFLAGS=-r ++ ++# tool for generating import libraries ++IMPLIB= ++IMPLIBFLAGS= ++ ++MAPSYM= ++MAPSYMFLAGS= ++ ++RC=irc ++RCFLAGS=-fo$@ $(RCFILES) ++RCLINK= ++RCLINKFLAGS= ++RCSETVERSION= ++ ++# platform specific identifier for shared libs ++DLLPRE=lib ++DLLPOST=.so +--- solenv/inc/unxfbsdi.mk Tue Jan 31 13:24:38 2006 ++++ solenv/inc/unxfbsdi.mk Fri May 19 13:52:19 2006 +@@ -33,192 +33,23 @@ + # + #************************************************************************* + +-# mk file for unxfbsdi +-ASM= +-AFLAGS= ++# ++# FreBSD/i386 specific defines ++# + +-SOLAR_JAVA*=TRUE +-JAVAFLAGSDEBUG=-g +- +-# filter for supressing verbose messages from linker +-#not needed at the moment +-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +- +-# _PTHREADS is needed for the stl +-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 +- +-# enable visibility define in "sal/types.h" +-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE +-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +- +-# this is a platform with JAVA support +-.IF "$(SOLAR_JAVA)"!="" +-JAVADEF=-DSOLAR_JAVA +-.IF "$(debug)"=="" +-JAVA_RUNTIME=-ljava +-.ELSE +-JAVA_RUNTIME=-ljava_g +-.ENDIF +-.ENDIF ++CDEFS+=-DX86 + + # architecture dependent flags for the C and C++ compiler that can be changed by + # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build + ARCH_FLAGS*=-mtune=pentiumpro + +-# name of C++ Compiler +-CXX*=g++ +-# name of C Compiler +-CC*=gcc +-.IF "$(SYSBASE)"!="" +-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +-CXX+:=$(CFLAGS_SYSBASE) +-CC+:=$(CFLAGS_SYSBASE) +-.ENDIF # "$(SYSBASE)"!="" +-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE) +- +-# flags to enable build with symbols; required for crashdump feature +-.IF "$(ENABLE_SYMBOLS)"=="SMALL" +-CFLAGSENABLESYMBOLS=-g1 +-.ELSE +-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta +- +-.ENDIF +- +-# flags for the C++ Compiler +-CFLAGSCC= -pipe $(ARCH_FLAGS) +-# Flags for enabling exception handling +-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +-# Flags for disabling exception handling +-CFLAGS_NO_EXCEPTIONS=-fno-exceptions +- +-# -fpermissive should be removed as soon as possible +-CFLAGSCXX= -pipe $(ARCH_FLAGS) +-CFLAGSCXX+= -Wno-ctor-dtor-privacy +-PICSWITCH:=-fpic +-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +-CFLAGSCXX += -fvisibility-inlines-hidden +-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +- +-# Compiler flags for compiling static object in single threaded environment with graphical user interface +-CFLAGSOBJGUIST= +-# Compiler flags for compiling static object in single threaded environment with character user interface +-CFLAGSOBJCUIST= +-# Compiler flags for compiling static object in multi threaded environment with graphical user interface +-CFLAGSOBJGUIMT= +-# Compiler flags for compiling static object in multi threaded environment with character user interface +-CFLAGSOBJCUIMT= +-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface +-CFLAGSSLOGUIMT=$(PICSWITCH) +-# Compiler flags for compiling shared object in multi threaded environment with character user interface +-CFLAGSSLOCUIMT=$(PICSWITCH) +-# Compiler flags for profiling +-CFLAGSPROF= +-# Compiler flags for debugging +-CFLAGSDEBUG=-g +-CFLAGSDBGUTIL= + # Compiler flags for enabling optimizations + .IF "$(PRODUCT)"!="" + CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products +-CFLAGSOPT+=-Wuninitialized # not supported without optimization ++CFLAGSOPT+=-Wuninitialized # not supported without optimization + .ELSE # "$(PRODUCT)"!="" +-CFLAGSOPT= # no optimizing for non products ++CFLAGSOPT= # no optimizing for non products + .ENDIF # "$(PRODUCT)"!="" +-# Compiler flags for disabling optimizations +-CFLAGSNOOPT=-O0 +-# Compiler flags for describing the output path +-CFLAGSOUTOBJ=-o +-# Enable all warnings +-CFLAGSWALL=-Wall +-# Set default warn level +-CFLAGSDFLTWARN= +- +-# switches for dynamic and static linking +-STATIC = -Wl,-Bstatic +-DYNAMIC = -Wl,-Bdynamic +- +-# name of linker +-LINK*=$(CXX) +-LINKC*=$(CC) +- +-# default linker flags +-LINKFLAGSDEFS*=#-Wl,-z,defs +-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' +-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) +- +-# linker flags for linking applications +-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec +-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec +- +-# linker flags for linking shared libraries +-LINKFLAGSSHLGUI= -shared +-LINKFLAGSSHLCUI= -shared +- +-LINKFLAGSTACK= +-LINKFLAGSPROF= +-LINKFLAGSDEBUG=-g +-LINKFLAGSOPT= +- +-# linker flags for optimization (symbol hashtable) +-# for now, applied to symbol scoped libraries, only +-LINKFLAGSOPTIMIZE*=-Wl,-O1 +-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script +- +-SONAME_SWITCH=-Wl,-h +- +-# Sequence of libs does matter ! +- +-STDLIBCPP=-lstdc++ +- +-# default objectfilenames to link +-STDOBJVCL=$(L)$/salmain.o +-STDOBJGUI= +-STDSLOGUI= +-STDOBJCUI= +-STDSLOCUI= +- +-# libraries for linking applications +-STDLIBCUIST=-lm +-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm +-STDLIBCUIMT=$(PTHREAD_LIBS) -lm +-STDLIBGUIST=-lX11 -lm +-# libraries for linking shared libraries +-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm +-STDSHLCUIMT=$(PTHREAD_LIBS) -lm +-STDSHLGUIST=-lX11 -lXext -lm +-STDSHLCUIST=-lm +- +-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive +- +-.IF "$(USE_STLP_DEBUG)" != "" +-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug +-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) +-.ELSE # "$(USE_STLP_DEBUG)" != "" +-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc +-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) +-.ENDIF # "$(USE_STLP_DEBUG)" != "" +- +-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) +- +-# name of library manager +-LIBMGR=ar +-LIBFLAGS=-r +- +-# tool for generating import libraries +-IMPLIB= +-IMPLIBFLAGS= +- +-MAPSYM= +-MAPSYMFLAGS= +- +-RC=irc +-RCFLAGS=-fo$@ $(RCFILES) +-RCLINK= +-RCLINKFLAGS= +-RCSETVERSION= + + # platform specific identifier for shared libs + DLLPOSTFIX=fi +-DLLPRE=lib +-DLLPOST=.so +- +--- solenv/inc/unxfbsdx.mk Fri May 19 13:13:25 2006 ++++ solenv/inc/unxfbsdx.mk Fri May 19 13:52:38 2006 +@@ -0,0 +1,57 @@ ++#************************************************************************* ++# ++# OpenOffice.org - a multi-platform office productivity suite ++# ++# $RCSfile$ ++# ++# $Revision$ ++# ++# last change: $Author$ $Date$ ++# ++# The Contents of this file are made available subject to ++# the terms of GNU Lesser General Public License Version 2.1. ++# ++# ++# GNU Lesser General Public License Version 2.1 ++# ============================================= ++# Copyright 2005 by Sun Microsystems, Inc. ++# 901 San Antonio Road, Palo Alto, CA 94303, USA ++# ++# This library is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Lesser General Public ++# License version 2.1, as published by the Free Software Foundation. ++# ++# This library is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# Lesser General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public ++# License along with this library; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++#************************************************************************* ++ ++# ++# FreBSD/amd64 specific defines ++# ++ ++CDEFS+=-DX86_64 ++ ++# architecture dependent flags for the C and C++ compiler that can be changed by ++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build ++.IF "$(CPUNAME)" == "X86_64" ++ARCH_FLAGS*= ++.ENDIF ++ ++# Compiler flags for enabling optimizations ++.IF "$(PRODUCT)"!="" ++CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products ++CFLAGSOPT+=-Wuninitialized # not supported without optimization ++.ELSE # "$(PRODUCT)"!="" ++CFLAGSOPT= # no optimizing for non products ++.ENDIF # "$(PRODUCT)"!="" ++ ++# platform specific identifier for shared libs ++DLLPOSTFIX=fx diff --git a/editors/openoffice.org-2.0-devel/files/patch-i65514 b/editors/openoffice.org-2.0-devel/files/patch-i65514 index 080244113777..cec0a4c24888 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-i65514 +++ b/editors/openoffice.org-2.0-devel/files/patch-i65514 @@ -1,12 +1,140 @@ ---- berkeleydb/makefile.mk 8 Mar 2006 14:13:53 -0000 1.31 -+++ berkeleydb/makefile.mk 12 May 2006 00:26:22 -0000 -@@ -88,6 +88,9 @@ - .IF "$(SOLAR_JAVA)"!="" - CONFIGURE_FLAGS+=--enable-java - .ENDIF -+.IF "$(COM)$(CPU)"=="GCCX" -+CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly -+.ENDIF - - BUILD_DIR=$(CONFIGURE_DIR) - BUILD_DIR_OUT=$(CONFIGURE_DIR) +--- berkeleydb/db-4.2.52.patch.orig Fri Dec 23 09:22:46 2005 ++++ berkeleydb/db-4.2.52.patch Fri May 19 17:44:11 2006 +@@ -205,6 +205,20 @@ + ! $(SLO)$/dbreg_util.obj + ! + ! .INCLUDE : target.mk ++*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003 ++--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006 ++*************** ++*** 193,198 **** ++--- 193,201 ---- ++ /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */ ++ #undef HAVE_MUTEX_X86_GCC_ASSEMBLY ++ +++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */ +++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY +++ ++ /* Define to 1 if you have the header file, and it defines `DIR'. */ ++ #undef HAVE_NDIR_H ++ + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2005-12-22 18:36:14.647415000 +0100 + *************** +@@ -241,6 +255,76 @@ + fi + + # Commands to make compiler produce verbose output that lists ++*************** ++*** 28556,28561 **** ++--- 28556,28606 ---- ++ rm -f conftest.$ac_objext conftest.$ac_ext ++ fi ++ +++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux +++ if test "$db_cv_mutex" = no; then +++ cat >conftest.$ac_ext <<_ACEOF +++ #line $LINENO "configure" +++ /* confdefs.h. */ +++ _ACEOF +++ cat confdefs.h >>conftest.$ac_ext +++ cat >>conftest.$ac_ext <<_ACEOF +++ /* end confdefs.h. */ +++ +++ int +++ main () +++ { +++ +++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__) +++ exit(0); +++ #else +++ FAIL TO COMPILE/LINK +++ #endif +++ +++ ; +++ return 0; +++ } +++ _ACEOF +++ rm -f conftest.$ac_objext +++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +++ (eval $ac_compile) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ db_cv_mutex="x86_64/gcc-assembly" +++ else +++ echo "$as_me: failed program was:" >&5 +++ sed 's/^/| /' conftest.$ac_ext >&5 +++ +++ fi +++ rm -f conftest.$ac_objext conftest.$ac_ext +++ fi +++ ++ # S390/cc: IBM OS/390 Unix ++ if test "$db_cv_mutex" = no; then ++ cat >conftest.$ac_ext <<_ACEOF ++*************** ++*** 28971,28976 **** ++--- 29016,29028 ---- ++ x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" ++ cat >>confdefs.h <<\_ACEOF ++ #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1 +++ _ACEOF +++ +++ +++ ;; +++ x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" +++ cat >>confdefs.h <<\_ACEOF +++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1 ++ _ACEOF ++ ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2005-12-22 18:36:14.447413000 +0100 + *************** +@@ -943,3 +1027,39 @@ + ! $(SLO)$/xa_map.obj + ! + ! .INCLUDE : target.mk ++*** misc/db-4.2.52.NC/dbinc/mutex.h Sat Sep 20 17:40:49 2003 ++--- misc/build/db-4.2.52.NC/dbinc/mutex.h Fri May 19 12:43:58 2006 ++*************** ++*** 781,786 **** ++--- 781,811 ---- ++ #endif ++ #endif ++ +++ /********************************************************************* +++ * x86_64/gcc assembly. +++ *********************************************************************/ +++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY +++ typedef unsigned char tsl_t; +++ +++ #ifdef LOAD_ACTUAL_MUTEX_CODE +++ /* +++ * For gcc/x86-64, 0 is clear, 1 is set. +++ */ +++ #define MUTEX_SET(tsl) ({ \ +++ register tsl_t *__l = (tsl); \ +++ int __r; \ +++ asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\ +++ : "=&a" (__r), "=m" (*__l) \ +++ : "1" (*__l) \ +++ ); \ +++ __r & 1; \ +++ }) +++ +++ #define MUTEX_UNSET(tsl) (*(tsl) = 0) +++ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl) +++ #endif +++ #endif +++ ++ /* ++ * Mutex alignment defaults to one byte. ++ * -- cgit v1.2.3