- updated to 1.0.2

Changed files:
    openoffice-ac.patch -> 1.6
    openoffice-braindamage.patch -> 1.2
    openoffice-remove-gpc.patch -> 1.2

diff --git a/openoffice-ac.patch b/openoffice-ac.patch
index 01ae349d79c81efa0b01b113412e7ee0a8c48593..d6ed1cc11bf1a38290bab8574f7e6208b5d39942 100644 (file)
--- a/openoffice-ac.patch
+++ b/openoffice-ac.patch
@@ -1,20 +1,5 @@
 --- oo_1.0_src/config_office/configure.in~~    Thu May  2 16:48:20 2002
 +++ oo_1.0_src/config_office/configure.in      Thu May  2 16:50:49 2002
-@@ -975,10 +975,10 @@
- dnl ***************************************
- dnl testing for X libraries and includes...
- dnl ***************************************
--if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
--   dnl Mac OS X using Aqua graphics. Don't check for X11.
--   :
--elif test "$_os" != "WINNT" ; then
-+dnl if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
-+dnl    dnl Mac OS X using Aqua graphics. Don't check for X11.
-+dnl    :
-+dnl elif test "$_os" != "WINNT" ; then
-    AC_PATH_X
-    AC_PATH_XTRA
- 
 @@ -998,10 +998,10 @@
     CFLAGS=$X_CFLAGS
     LDFLAGS="$X_LDFLAGS $X_LIBS"
@@ -30,12 +15,3 @@
  dnl ***************************************
  dnl testing libc version for Linux...
  dnl ***************************************
-@@ -1202,7 +1202,7 @@
- 
- # Executing the set_soenv script to setup the environment variables.
- if test -z "$enable_check_only"; then
--   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
-+   './set_soenv' NO_GCC $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
- else
-    echo
-    echo Test Complete

diff --git a/openoffice-braindamage.patch b/openoffice-braindamage.patch
index 32e2a170f3cbff8cb604aea069741f3371577f5a..010bd4e919822503ea286ab60f7aee85cf08cdac 100644 (file)
--- a/openoffice-braindamage.patch
+++ b/openoffice-braindamage.patch
@@ -243,188 +243,246 @@
  .ENDIF                        # "$(APP10LINKRES)" != ""
 --- oo_1.0_src/solenv/inc/_tg_shl.mk.suxx      Fri Jun 14 11:31:07 2002
 +++ oo_1.0_src/solenv/inc/_tg_shl.mk   Fri Jun 14 11:43:39 2002
-@@ -226,10 +226,10 @@
-       @-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+@@ -231,15 +231,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL1TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL1TARGET:b)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL1DEFAULTRES)"!=""
-@@ -651,10 +651,10 @@
-       @-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+@@ -693,15 +693,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL2TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL2TARGET:b)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL2DEFAULTRES)"!=""
-@@ -1076,10 +1076,10 @@
-       @-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+@@ -1155,15 +1155,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL3TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL3TARGET:b)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL3DEFAULTRES)"!=""
-@@ -1501,10 +1501,10 @@
-       @-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+@@ -1617,15 +1617,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL4TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL4TARGET:b)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL4DEFAULTRES)"!=""
-@@ -1926,10 +1926,10 @@
-       @-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+@@ -2079,15 +2079,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL5TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL5TARGET:b)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL5DEFAULTRES)"!=""
-@@ -2351,10 +2351,10 @@
-       @-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+@@ -2541,15 +2541,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL6TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL6TARGET:b)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL6DEFAULTRES)"!=""
-@@ -2776,10 +2776,10 @@
-       @-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+@@ -3003,15 +3003,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL7TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL7TARGET:b)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL7DEFAULTRES)"!=""
-@@ -3201,10 +3201,10 @@
-       @-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+@@ -3465,15 +3465,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL8TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL8TARGET:b)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL8DEFAULTRES)"!=""
-@@ -3626,10 +3626,10 @@
-       @-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+@@ -3927,15 +3927,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL9TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL9TARGET:b)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL9DEFAULTRES)"!=""
-@@ -4051,10 +4051,10 @@
-       @-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+@@ -4389,15 +4389,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL10TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL10TARGET:b)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL10DEFAULTRES)"!=""
---- oo_1.0_src/solenv/inc/settings.mk.suxx     Fri Jun 14 11:31:14 2002
-+++ oo_1.0_src/solenv/inc/settings.mk  Fri Jun 14 11:43:58 2002
-@@ -617,14 +617,14 @@
- .IF "$(GUI)"=="UNX"
-       @+echo \# > $(OUT)$/inc$/myworld.mk
- .ELSE                 # "$(GUI)"=="UNX"
--      @+echo # > $(OUT)$/inc$/myworld.mk
-+      @+echo "#" > $(OUT)$/inc$/myworld.mk
- .ENDIF                        # "$(GUI)"=="UNX"
- .IF "$(common_build)"!=""
-       @+$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
- .IF "$(GUI)"=="UNX"
-       @+echo \# > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
- .ELSE                 # "$(GUI)"=="UNX"
--      @+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
-+      @+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
- .ENDIF                        # "$(GUI)"=="UNX"
- .ENDIF                        # "$(common_build)"!=""
- 
-@@ -638,10 +638,10 @@
- 
- %worldremote.mk :
-       @+$(MKOUT) -r $(ROUT)
--      @+echo # > $(OUT)$/inc$/myworldremote.mk
-+      @+echo "#" > $(OUT)$/inc$/myworldremote.mk
- .IF "$(common_build)"!=""
-       @+$(MKOUT) -r $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
--      @+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
-+      @+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
- .ENDIF                        # "$(common_build)"!=""
- 
- .INCLUDE .IGNORE : $(OUT)$/inc$/myworldremote.mk
 --- oo_1.0_src/solenv/inc/tg_app.mk.suxx       Fri Jun 14 11:31:29 2002
 +++ oo_1.0_src/solenv/inc/tg_app.mk    Fri Jun 14 11:44:23 2002
 @@ -208,8 +208,8 @@
@@ -454,21 +512,30 @@
  
 --- oo_1.0_src/solenv/inc/tg_shl.mk.suxx       Fri Jun 14 11:31:45 2002
 +++ oo_1.0_src/solenv/inc/tg_shl.mk    Fri Jun 14 11:45:07 2002
-@@ -326,10 +326,10 @@
-       @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+@@ -331,15 +331,15 @@
  .ENDIF
  .IF "$(use_shl_versions)" != ""
+ .IF "$(USE_SHELL)"!="4nt"
+-      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+-      @-+echo #define ORG_NAME        $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+-      @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+-       @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ .ELSE                 # "$(USE_SHELL)"!="4nt"
 -      @-+echo #define VERVARIANT      $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
 -      @-+echo #define ORG_NAME        $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
 -      @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
 -       @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+      @-+echo "#define VERVARIANT     $(BUILD)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+      @-+echo "#define ORG_NAME       $(SHL$(TNR)TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+      @-+echo "#define INTERNAL_NAME $(SHL$(TNR)TARGET:b)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+       @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++      @-+echo "#define VERVARIANT"    $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++      @-+echo "#define ORG_NAME"      $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++      @-+echo "#define INTERNAL_NAME" $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
++       @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ .ENDIF                        # "$(USE_SHELL)"!="4nt"
  .ENDIF                        # "$(use_shl_versions)" != ""
        $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- .ENDIF                        # "$(SHL$(TNR)DEFAULTRES)"!=""
 --- oo_1.0_src/tools/os2/source/wps/makefile.mk.suxx   Fri Jun 14 11:47:53 2002
 +++ oo_1.0_src/tools/os2/source/wps/makefile.mk        Fri Jun 14 11:48:23 2002
 @@ -211,8 +211,8 @@

diff --git a/openoffice-remove-gpc.patch b/openoffice-remove-gpc.patch
index dd612d48da01e406c9191dc65b9efd6cf49040ea..ad7316dc9945213d20fd55d56a8db8c4d5292cdc 100644 (file)
--- a/openoffice-remove-gpc.patch
+++ b/openoffice-remove-gpc.patch
@@ -68,14 +68,14 @@ diff -Naur OOO_STABLE_1.orig/gpc.diff OOO_STABLE_1/gpc.diff
 diff -Naur OOO_STABLE_1.orig/solenv/inc/libs.mk OOO_STABLE_1/solenv/inc/libs.mk
 --- OOO_STABLE_1.orig/solenv/inc/libs.mk       Fri Oct 26 17:14:41 2001
 +++ OOO_STABLE_1/solenv/inc/libs.mk    Wed Apr 24 20:50:33 2002
-@@ -70,7 +70,7 @@
- #externe libs in plattform.mk
+@@ -73,7 +73,7 @@
  #
  
+ ICUI18NLIB=-licui18n -licuuc -licule -licudata
 -GPC3RDLIB=-lgpc
 +GPC3RDLIB=-lgpcl
  SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
- XMLSCRIPTLIB =-lxcr$(UPD)$(DLLPOSTFIX)
+ XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX)
  COMPHELPERLIB=-lcomphelp2
 diff -Naur OOO_STABLE_1.orig/vcl/source/gdi/poly2.cxx OOO_STABLE_1/vcl/source/gdi/poly2.cxx
 --- OOO_STABLE_1.orig/vcl/source/gdi/poly2.cxx Thu Mar 22 16:20:15 2001