Update to DEV300_m102.

2 files changed, 68 insertions, 13 deletions

diff --git a/editors/openoffice-3-devel/files/patch-i10000 b/editors/openoffice-3-devel/files/patch-i10000
deleted file mode 100644
index 8a48c1641dea..000000000000
--- a/editors/openoffice-3-devel/files/patch-i10000
+++ /dev/null
@@ -1,13 +0,0 @@
-http://hg.services.openoffice.org/DEV300/rev/a22158b47c13
-http://www.mail-archive.com/dev@openoffice.org/msg15401.html
-
---- set_soenv.in	2011-03-28 20:50:13.000000000 +0900
-+++ set_soenv.in	2011-06-12 16:32:09.000000000 +0900
-@@ -1497,6 +1497,7 @@
- #
- print "done\n";
- $gb_REPOS = $SRC_ROOT;
-+my $BUILD_TYPE = "@BUILD_TYPE@";
- 
- if ('@WITH_LANG@' ne "")
- {
diff --git a/editors/openoffice-3-devel/files/patch-i117269 b/editors/openoffice-3-devel/files/patch-i117269
new file mode 100644
index 000000000000..3c52e846687b
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i117269
@@ -0,0 +1,68 @@
+--- configure.in	2011-06-12 20:29:44.000000000 +0900
++++ configure.in	2011-06-12 20:31:29.000000000 +0900
+@@ -3482,10 +3482,9 @@
+          AC_MSG_RESULT(yes)
+       fi
+       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
+-         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
++         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi
+       else
+-         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
+-$SED -e s/c++/strip/`, false)
++         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/`, false)
+       fi
+       if test "$MINGWSTRIP" = "false"; then
+          AC_MSG_ERROR(MinGW32 binutils needed. Install them.)
+
+--- configure	2011-03-28 23:03:11.000000000 +0900
++++ configure	2011-06-12 20:48:45.000000000 +0900
+@@ -12960,13 +12960,11 @@
+ echo "${ECHO_T}yes" >&6
+       fi
+       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
+-         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
++         if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi
+       else
+          if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
+-$SED -e s/c++/strip/`", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
+-$SED -e s/c++/strip/`; ac_word=$2
++  # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
++set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then
+@@ -12982,8 +12980,7 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
+-$SED -e s/c++/strip/`"
++    ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -13004,10 +13001,8 @@
+ fi
+ if test -z "$ac_cv_prog_MINGWSTRIP"; then
+   ac_ct_MINGWSTRIP=$MINGWSTRIP
+-  # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
+-$SED -e s/c++/strip/`", so it can be a program name with args.
+-set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
+-$SED -e s/c++/strip/`; ac_word=$2
++  # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
++set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then
+@@ -13023,8 +13018,7 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
+-$SED -e s/c++/strip/`"
++    ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi