[ooo-build-commit] .: 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/apply               |    5 ++--
 patches/dev300/cws-systemlibc.diff |   40 +++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit ed0cfcd38f064c9d58dc39e48eb201225aad593e
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 9 01:46:23 2010 +0200

    cws-koheiautodecimal-* is in m80
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8a4d3bc..f497ead 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -179,13 +179,14 @@ helpcontent-scalc-01.diff, kohei
 [ LocalizeFixes ]
 # FIXME dev300-m77 helpcontent-scalc-01-localize.diff, kohei
 
-[ CWSBackports ]
+[ CWSBackports < dev300-m80 ]
 # automatic decimal adjustment per column width.
 cws-koheiautodecimal-boost.diff,          kohei
 cws-koheiautodecimal-sc.diff,             kohei
 cws-koheiautodecimal-svl.diff,            kohei
 cws-koheiautodecimal-testautomation.diff, kohei
 
+[ CWSBackports ]
 # calctabcolor cws (tab color feature by Daniel Watson)
 cws-calctabcolor-accessibility.diff, kohei
 cws-calctabcolor-filter.diff,        kohei
@@ -3361,7 +3362,7 @@ docx-fixes02.diff, n#581604, cbosdo
 [ OOXMLExport321 and not OOXMLExportDevel ]
 # FIXME dev300-m77 oox-chart-export-part1.diff, Fong
 
-[ kFreeBSD ]
+[ kFreeBSD < dev300-m82 ]
 cws-kfreebsdport01v2.diff, rengelha
 
 [ AXP < dev300-m78 ]
commit 2e05a75bfd10d54592a23fab011a85c811dfff2a
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 9 01:43:17 2010 +0200

    update cws systemlibc
    
    * patches/dev300/cws-systemlibc.diff:

diff --git a/patches/dev300/cws-systemlibc.diff b/patches/dev300/cws-systemlibc.diff
index 6835f87..e3e1d80 100644
--- a/patches/dev300/cws-systemlibc.diff
+++ b/patches/dev300/cws-systemlibc.diff
@@ -1,11 +1,3 @@
-
-# HG changeset patch
-# User Rene Engelhard <rene at openoffice.org>
-# Date 1274184320 -7200
-# Node ID 0db036bf824fc489595f3593db6e72389d5f00db
-# Parent  9d3789dba51999a4be5144a85419dee8d5c52375
-systemlibc: migrate systemlibc to hg; try again from scratch
-
 diff -r 9d3789dba519 -r 0db036bf824f configure.in
 --- configure.in	Wed Apr 21 19:22:29 2010 +0200
 +++ configure.in	Tue May 18 14:05:20 2010 +0200
@@ -13,13 +5,19 @@ diff -r 9d3789dba519 -r 0db036bf824f configure.in
     fi
  fi
  
-+AC_CHECK_FUNCS(getopt, SYSTEM_GETOPT=YES, [SYSTEM_GETOPT=NO])
-+AC_CHECK_FUNCS(readdir_r, SYSTEM_READDIR_R=YES, [SYSTEM_READDIR_R=NO])
-+if test "$SYSTEM_GETOPT" = "YES" -a "$SYSTEM_READDIR_R" = "YES"; then
++if test "$_os" != "WINNT"; then
++  AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
++  AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
++  if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
 +	SYSTEM_GLIBC=YES
-+fi
-+AC_SUBST(SYSTEM_GETOPT)
-+AC_SUBST(SYSTEM_READDIR_R)
++  fi
++else
++  HAVE_GETOPT=NO
++  HAVE_READDIR_R=NO
++  SYSTEM_GLIBC=NO
++endif
++AC_SUBST(HAVE_GETOPT)
++AC_SUBST(HAVE_READDIR_R)
 +AC_SUBST(SYSTEM_GLIBC)
 +
  dnl =========================================
@@ -41,7 +39,7 @@ diff -r 9d3789dba519 -r 0db036bf824f external/glibc-2.1.3.patch
  +
  +# --- Files --------------------------------------------------------
  +
-++.IF "$(SYSTEM_GETOPT)" != "YES"
+++.IF "$(HAVE_GETOPT)" != "YES"
  +OBJFILES=	$(OBJ)$/getopt.obj		\
  +			$(OBJ)$/getopt1.obj
  +
@@ -51,7 +49,7 @@ diff -r 9d3789dba519 -r 0db036bf824f external/glibc-2.1.3.patch
 ++.ENDIF
  +
 -+.IF "$(OS)"=="NETBSD"
-++.IF "$(SYSTEM_READDIR_R)" != "YES"
+++.IF "$(HAVE_READDIR_R)" != "YES"
  +TARGET2=gnu_readdir_r
  +OBJFILES+= $(OBJ)$/readdir_r.obj
  +LIB2TARGET=$(SLB)$/$(TARGET2).lib
@@ -59,7 +57,7 @@ diff -r 9d3789dba519 -r 0db036bf824f external/glibc-2.1.3.patch
  +LIB2OBJFILES= $(OBJ)$/readdir_r.obj
  +.ENDIF
  +
-++.IF "$(SYSTEM_READDIR_R)" == "YES" && "$(SYSTEM_GETOPT)" == "YES"
+++.IF "$(HAVE_READDIR_R)" == "YES" && "$(HAVE_GETOPT)" == "YES"
 ++ at all:
 ++	@echo "Nothing to do here.
 ++.ENDIF
@@ -74,13 +72,13 @@ diff -r 9d3789dba519 -r 0db036bf824f external/glibc/makefile.mk
  
  # --- Files --------------------------------------------------------
  
-+.IF "$(SYSTEM_GETOPT)" != "YES" || "$(SYSTEM_READDIR_R)" != "YES"
++.IF "$(HAVE_GETOPT)" != "YES" || "$(HAVE_READDIR_R)" != "YES"
  TARFILE_NAME=glibc-2.1.3-stub
  TARFILE_MD5=4a660ce8466c9df01f19036435425c3a
  TARFILE_ROOTDIR=glibc-2.1.3
 -ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c
 +ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h
-+.IF "$(SYSTEM_READDIR_R)" != "YES"
++.IF "$(HAVE_READDIR_R)" != "YES"
 +ADDITIONAL_FILES += posix$/readdir_r.c
 +.ENDIF
  
@@ -249,8 +247,8 @@ diff -r 9d3789dba519 -r 0db036bf824f set_soenv.in
  ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
  ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
  ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
-+ToFile( "SYSTEM_GETOPT",     "@SYSTEM_GETOPT@",    "e" );
-+ToFile( "SYSTEM_READDIR_R",  "@SYSTEM_READDIR_R@", "e" );
++ToFile( "HAVE_GETOPT",       "@HAVE_GETOPT@",      "e" );
++ToFile( "HAVE_READDIR_R",    "@HAVE_READDIR_R@",   "e" );
 +ToFile( "SYSTEM_GLIBC",      "@SYSTEM_GLIBC@",     "e" );
  ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
  ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );