diff options
Diffstat (limited to 'misc/openoffice/patches/patch-ao')
| -rw-r--r-- | misc/openoffice/patches/patch-ao | 79 |
1 files changed, 17 insertions, 62 deletions
diff --git a/misc/openoffice/patches/patch-ao b/misc/openoffice/patches/patch-ao index c8025b6d80e..0fcd6a1ea5e 100644 --- a/misc/openoffice/patches/patch-ao +++ b/misc/openoffice/patches/patch-ao @@ -1,64 +1,19 @@ -$NetBSD: patch-ao,v 1.2 2002/08/02 20:33:23 jdolecek Exp $ +$NetBSD: patch-ao,v 1.3 2004/05/03 20:56:36 mrauch Exp $ ---- configure.in.orig Mon Nov 12 22:45:53 2001 -+++ configure.in Fri Aug 2 21:14:58 2002 -@@ -204,12 +204,14 @@ - dnl ****************************************** - dnl Check whether the gnu gcc compiler is used. - if test -z "$with_gcc_home"; then -- if test "$CC" = "gcc"; then -- AC_PATH_PROG(GCC, gcc) -- COMPATH=`echo $GCC | $SED -n "s/\/gcc//p"` -+ dnl NetBSD pkgsrc is guaranteed to have gcc. -+ dnl if test "$CC" = "gcc"; then -+ GCC=$CC -+ COMPATH=`echo $GCC | $AWK '{print $1}' | xargs dirname ` -+ CCFLAGS=$LDFLAGS; export CCFLAGS; - _gcc_include_start=/usr/lib/gcc-lib - _gxx_include_start=/usr/include -- fi -+ dnl fi - else - dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home - _gcc_path="$with_gcc_home/bin/gcc" -@@ -256,6 +258,9 @@ - dnl find include paths now - AC_MSG_CHECKING([the GNU gcc include paths]) - _gcc_include_path=`find $_gcc_include_start -name $_gcc_version -print 2> /dev/null` -+ if test "$_os" = "NetBSD" -a -z "$_gcc_include_path"; then -+ _gcc_include_path="/usr" -+ fi - if test "$_gcc_include_path"; then - _multiple=`echo $_gcc_include_path | $AWK '{ if ($2) print "true"; else print "false" }'` - if test "$_multiple" = "false"; then -@@ -305,7 +310,7 @@ - _gcc_include_path="NO_GCC_INCLUDE" - fi - else -- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -+ if test "$_os" = "FreeBSD" ; then - _gcc_include_path="/usr/include/g++" - else - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) -@@ -740,6 +745,12 @@ - fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` -+ _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'` -+ -+ if test "$_jdk_middle" = "false" -a \( "$_jdk_middle3" = "true" -o "$_jdk_middle4" = "true" \); then -+ _jdk_minor="true" -+ fi - fi - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -982,7 +993,7 @@ - HAVE_GPC_C="yes" - fi +--- ../i18npool/source/breakiterator/gendict.cxx.orig 2004-04-17 19:30:03.000000000 +0200 ++++ ../i18npool/source/breakiterator/gendict.cxx +@@ -95,8 +95,12 @@ int SAL_CALL main(int argc, char* argv[] + fprintf(cfp, "extern \"C\" {\n"); --if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then -+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - AC_MSG_RESULT([GPC files found]) - else - AC_MSG_ERROR([GPC files not found]) + sal_Int32 count, i, j; +- sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, charArray[0x10000]; +- sal_Bool exist[0x10000]; ++ sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, *charArray; ++ sal_Bool *exist; ++ charArray = (sal_Int32*) malloc(0x10000*sizeof(*charArray)); ++ if (charArray == NULL) exit(1); ++ exist = (sal_Bool*) malloc(0x10000*sizeof(*exist)); ++ if (exist == NULL) exit(1); + for (i = 0; i < 0x10000; i++) { + exist[i] = sal_False; + charArray[i] = 0; |