[openoffice] branch AOO42X updated: dmake 4.13 already does this...

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 61ce3ec  dmake 4.13 already does this...
61ce3ec is described below

commit 61ce3ec7321ae1caa0f614e7e7cd7e9d4c105425
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Fri Nov 27 15:11:57 2020 -0500

    dmake 4.13 already does this...
    
    (cherry picked from commit 476148e50445f36e2a7f3bbbdc200a6c2600a658)
---
 main/bootstrap.1                     |  3 ---
 main/solenv/src/dmake-cygwin64.patch | 48 ------------------------------------
 2 files changed, 51 deletions(-)

diff --git a/main/bootstrap.1 b/main/bootstrap.1
index 822f286..127a703 100644
--- a/main/bootstrap.1
+++ b/main/bootstrap.1
@@ -140,9 +140,6 @@ if test -n "$DMAKE_URL" -a  ! -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then
     cp $SOLARSRC/config.guess .
     cp $SOLARSRC/config.sub .
 
-    # We also need to patch dmake for Win64
-    patch -p0 < $SOLARSRC/solenv/src/dmake-cygwin64.patch
-
     ./configure $DMAKE_CONF || exit
 
     ## invoke the gnu make command set by configure.
diff --git a/main/solenv/src/dmake-cygwin64.patch b/main/solenv/src/dmake-cygwin64.patch
deleted file mode 100644
index b363cb2..0000000
--- a/main/solenv/src/dmake-cygwin64.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur path.c path.c
---- path.c	2011-09-25 18:53:42.000000000 +0200
-+++ path.c	2018-03-04 08:13:24.836905800 +0200
-@@ -317,8 +317,8 @@
- #if __CYGWIN__
-    /* Use cygwin function to convert a DOS path to a POSIX path. */
-    if( *path && path[1] == ':' && isalpha(*path) ) {
--      int err = cygwin_conv_to_posix_path(path, cpath);
--      if (err)
-+      int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, path, cpath, PATH_MAX);
-+      if (err < 0)
- 	 Fatal( "error converting \"%s\" - %s\n",
- 		path, strerror (errno));
-       if( path[2] != '/' && path[2] != '\\' )
-diff -Nur sysintf.c sysintf.c
---- sysintf.c	2011-09-25 18:53:42.000000000 +0200
-+++ sysintf.c	2018-03-04 08:15:54.315421400 +0200
-@@ -69,7 +69,7 @@
- #   include <sys/timeb.h>
- #endif
- 
--/* for cygwin_conv_to_posix_path() in Prolog() and for cygdospath()*/
-+/* for cygwin_conv_path() in Prolog() and for cygdospath()*/
- #if __CYGWIN__
- #   include <sys/cygwin.h>
- #endif
-@@ -538,8 +538,8 @@
-    if ( (CygDrvPre = MALLOC( PATH_MAX, char)) == NIL(char) )
-       No_ram();
-    else {
--      int err = cygwin_conv_to_posix_path("c:", CygDrvPre);
--      if (err)
-+      int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, "c:", CygDrvPre, PATH_MAX);
-+      if (err < 0)
- 	 Fatal( "error converting \"%s\" - %s\n",
- 		CygDrvPre, strerror (errno));
-       if( (CygDrvPreLen = strlen(CygDrvPre)) == 2 ) {
-@@ -1144,8 +1144,8 @@
- 
-    if( *src && src[0] == '/' ) {
-       char *tmp;
--      int err = cygwin_conv_to_win32_path(src, buf);
--      if (err)
-+      int err = cygwin_conv_path(CCP_POSIX_TO_WIN_A, src, buf, PATH_MAX);
-+      if (err < 0)
- 	 Fatal( "error converting \"%s\" - %s\n",
- 		src, strerror (errno));
-