Re: [openoffice] branch trunk updated: New URL for dmake

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: New URL for dmake

Matthias Seidel
Hi Jim,

Tried with dmake 4.13.0:

making and entering
C:/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/
unpacking
/cygdrive/c/Source/openoffice/ext_sources/07927163cc251770d2624d816f2e9b9e-dmake-4.13.0.tar.gz
entering dmake-4.13.0
patching file path.c
Hunk #1 FAILED at 317.
1 out of 1 hunk FAILED -- saving rejects to file path.c.rej
patching file sysintf.c
Hunk #1 FAILED at 69.
Hunk #2 FAILED at 538.
Hunk #3 succeeded at 1148 (offset 4 lines).
2 out of 3 hunks FAILED -- saving rejects to file sysintf.c.rej

Are these patches still needed?

Regards,

   Matthias

Am 27.11.20 um 15:32 schrieb [hidden email]:

> This is an automated email from the ASF dual-hosted git repository.
>
> jim pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
>      new 6d55344  New URL for dmake
> 6d55344 is described below
>
> commit 6d55344ade3d5a22c457d996194d8d8a0bbeee82
> Author: Jim Jagielski <[hidden email]>
> AuthorDate: Fri Nov 27 09:32:21 2020 -0500
>
>     New URL for dmake
> ---
>  main/configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/main/configure.ac b/main/configure.ac
> index 430b796..8b54a22 100644
> --- a/main/configure.ac
> +++ b/main/configure.ac
> @@ -28,7 +28,7 @@ AC_ARG_WITH(dmake-path,
>  ])
>  AC_ARG_WITH(dmake-url,
>  [  --with-dmake-url=<URL>   Specify the location of downloadable dmake source code. For example:
> -                          https://sourceforge.net/projects/oooextras.mirror/files/dmake-4.12.tar.bz2
> +                          https://github.com/jimjag/dmake/archive/v4.13.0/dmake-4.13.0.tar.gz
>                            Note that dmake is under GPL license.],
>  [  DMAKE_URL="$withval"
>  ])
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: New URL for dmake

Matthias Seidel
Additionally, since this happens when building on Windows, the patch
seems to be:

/main/solenv/src/dmake-cygwin64.patch

It was made by Damjan for the planned Windows 64 build.

Regards,

   Matthias

Am 27.11.20 um 18:41 schrieb Matthias Seidel:

> Hi Jim,
>
> Tried with dmake 4.13.0:
>
> making and entering
> C:/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/
> unpacking
> /cygdrive/c/Source/openoffice/ext_sources/07927163cc251770d2624d816f2e9b9e-dmake-4.13.0.tar.gz
> entering dmake-4.13.0
> patching file path.c
> Hunk #1 FAILED at 317.
> 1 out of 1 hunk FAILED -- saving rejects to file path.c.rej
> patching file sysintf.c
> Hunk #1 FAILED at 69.
> Hunk #2 FAILED at 538.
> Hunk #3 succeeded at 1148 (offset 4 lines).
> 2 out of 3 hunks FAILED -- saving rejects to file sysintf.c.rej
>
> Are these patches still needed?
>
> Regards,
>
>    Matthias
>
> Am 27.11.20 um 15:32 schrieb [hidden email]:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> jim pushed a commit to branch trunk
>> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>>
>>
>> The following commit(s) were added to refs/heads/trunk by this push:
>>      new 6d55344  New URL for dmake
>> 6d55344 is described below
>>
>> commit 6d55344ade3d5a22c457d996194d8d8a0bbeee82
>> Author: Jim Jagielski <[hidden email]>
>> AuthorDate: Fri Nov 27 09:32:21 2020 -0500
>>
>>     New URL for dmake
>> ---
>>  main/configure.ac | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/main/configure.ac b/main/configure.ac
>> index 430b796..8b54a22 100644
>> --- a/main/configure.ac
>> +++ b/main/configure.ac
>> @@ -28,7 +28,7 @@ AC_ARG_WITH(dmake-path,
>>  ])
>>  AC_ARG_WITH(dmake-url,
>>  [  --with-dmake-url=<URL>   Specify the location of downloadable dmake source code. For example:
>> -                          https://sourceforge.net/projects/oooextras.mirror/files/dmake-4.12.tar.bz2
>> +                          https://github.com/jimjag/dmake/archive/v4.13.0/dmake-4.13.0.tar.gz
>>                            Note that dmake is under GPL license.],
>>  [  DMAKE_URL="$withval"
>>  ])
>>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: New URL for dmake

Jim Jagielski
I don't think that patch is needed anymore... IIRC it removed cygwin_conv_to_posix_path, which is already done in dmake-4.13



> On Nov 27, 2020, at 1:14 PM, Matthias Seidel <[hidden email]> wrote:
>
> Additionally, since this happens when building on Windows, the patch
> seems to be:
>
> /main/solenv/src/dmake-cygwin64.patch
>
> It was made by Damjan for the planned Windows 64 build.
>
> Regards,
>
>    Matthias
>
> Am 27.11.20 um 18:41 schrieb Matthias Seidel:
>> Hi Jim,
>>
>> Tried with dmake 4.13.0:
>>
>> making and entering
>> C:/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/
>> unpacking
>> /cygdrive/c/Source/openoffice/ext_sources/07927163cc251770d2624d816f2e9b9e-dmake-4.13.0.tar.gz
>> entering dmake-4.13.0
>> patching file path.c
>> Hunk #1 FAILED at 317.
>> 1 out of 1 hunk FAILED -- saving rejects to file path.c.rej
>> patching file sysintf.c
>> Hunk #1 FAILED at 69.
>> Hunk #2 FAILED at 538.
>> Hunk #3 succeeded at 1148 (offset 4 lines).
>> 2 out of 3 hunks FAILED -- saving rejects to file sysintf.c.rej
>>
>> Are these patches still needed?
>>
>> Regards,
>>
>>    Matthias
>>
>> Am 27.11.20 um 15:32 schrieb [hidden email]:
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> jim pushed a commit to branch trunk
>>> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>>>
>>>
>>> The following commit(s) were added to refs/heads/trunk by this push:
>>>     new 6d55344  New URL for dmake
>>> 6d55344 is described below
>>>
>>> commit 6d55344ade3d5a22c457d996194d8d8a0bbeee82
>>> Author: Jim Jagielski <[hidden email]>
>>> AuthorDate: Fri Nov 27 09:32:21 2020 -0500
>>>
>>>    New URL for dmake
>>> ---
>>> main/configure.ac | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/main/configure.ac b/main/configure.ac
>>> index 430b796..8b54a22 100644
>>> --- a/main/configure.ac
>>> +++ b/main/configure.ac
>>> @@ -28,7 +28,7 @@ AC_ARG_WITH(dmake-path,
>>> ])
>>> AC_ARG_WITH(dmake-url,
>>> [  --with-dmake-url=<URL>   Specify the location of downloadable dmake source code. For example:
>>> -                          https://sourceforge.net/projects/oooextras.mirror/files/dmake-4.12.tar.bz2
>>> +                          https://github.com/jimjag/dmake/archive/v4.13.0/dmake-4.13.0.tar.gz
>>>                           Note that dmake is under GPL license.],
>>> [  DMAKE_URL="$withval"
>>> ])
>>>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: New URL for dmake

Matthias Seidel
Hi Jim,

Am 27.11.20 um 21:38 schrieb Jim Jagielski:
> I don't think that patch is needed anymore... IIRC it removed cygwin_conv_to_posix_path, which is already done in dmake-4.13
Now I get this error and dmake does not build (in Cygwin 64):

---

sysintf.c: In function ‘cygdospath’:
sysintf.c:1151:17: warning: implicit declaration of function
‘cygwin_conv_to_win32_path’; did you mean ‘cygwin_conv_path’?
[-Wimplicit-function-declaration]
 1151 |       int err = cygwin_conv_to_win32_path(src, buf);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
      |                 cygwin_conv_path

...

/usr/lib/gcc/x86_64-pc-cygwin/10/../../../../x86_64-pc-cygwin/bin/ld:
sysintf.o: in function `cygdospath':
/cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0/sysintf.c:1151:
undefined reference to `cygwin_conv_to_win32_path'
/cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0/sysintf.c:1151:(.text+0x1203):
relocation truncated to fit: R_X86_64_PC32 against undefined symbol
`cygwin_conv_to_win32_path'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:584: dmake.exe] Error 1
make[2]: Leaving directory
'/cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0'
make[1]: *** [Makefile:661: all-recursive] Error 1
make[1]: Leaving directory
'/cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0'
make: *** [Makefile:427: all] Error 2

---

Regards,

   Matthias

>
>
>
>> On Nov 27, 2020, at 1:14 PM, Matthias Seidel <[hidden email]> wrote:
>>
>> Additionally, since this happens when building on Windows, the patch
>> seems to be:
>>
>> /main/solenv/src/dmake-cygwin64.patch
>>
>> It was made by Damjan for the planned Windows 64 build.
>>
>> Regards,
>>
>>    Matthias
>>
>> Am 27.11.20 um 18:41 schrieb Matthias Seidel:
>>> Hi Jim,
>>>
>>> Tried with dmake 4.13.0:
>>>
>>> making and entering
>>> C:/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/
>>> unpacking
>>> /cygdrive/c/Source/openoffice/ext_sources/07927163cc251770d2624d816f2e9b9e-dmake-4.13.0.tar.gz
>>> entering dmake-4.13.0
>>> patching file path.c
>>> Hunk #1 FAILED at 317.
>>> 1 out of 1 hunk FAILED -- saving rejects to file path.c.rej
>>> patching file sysintf.c
>>> Hunk #1 FAILED at 69.
>>> Hunk #2 FAILED at 538.
>>> Hunk #3 succeeded at 1148 (offset 4 lines).
>>> 2 out of 3 hunks FAILED -- saving rejects to file sysintf.c.rej
>>>
>>> Are these patches still needed?
>>>
>>> Regards,
>>>
>>>    Matthias
>>>
>>> Am 27.11.20 um 15:32 schrieb [hidden email]:
>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>
>>>> jim pushed a commit to branch trunk
>>>> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>>>>
>>>>
>>>> The following commit(s) were added to refs/heads/trunk by this push:
>>>>     new 6d55344  New URL for dmake
>>>> 6d55344 is described below
>>>>
>>>> commit 6d55344ade3d5a22c457d996194d8d8a0bbeee82
>>>> Author: Jim Jagielski <[hidden email]>
>>>> AuthorDate: Fri Nov 27 09:32:21 2020 -0500
>>>>
>>>>    New URL for dmake
>>>> ---
>>>> main/configure.ac | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/main/configure.ac b/main/configure.ac
>>>> index 430b796..8b54a22 100644
>>>> --- a/main/configure.ac
>>>> +++ b/main/configure.ac
>>>> @@ -28,7 +28,7 @@ AC_ARG_WITH(dmake-path,
>>>> ])
>>>> AC_ARG_WITH(dmake-url,
>>>> [  --with-dmake-url=<URL>   Specify the location of downloadable dmake source code. For example:
>>>> -                          https://sourceforge.net/projects/oooextras.mirror/files/dmake-4.12.tar.bz2
>>>> +                          https://github.com/jimjag/dmake/archive/v4.13.0/dmake-4.13.0.tar.gz
>>>>                           Note that dmake is under GPL license.],
>>>> [  DMAKE_URL="$withval"
>>>> ])
>>>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: New URL for dmake

Jim Jagielski
Try w/ https://github.com/jimjag/dmake/archive/v4.13.1/dmake-4.13.1.tar.gz

> On Nov 27, 2020, at 3:50 PM, Matthias Seidel <[hidden email]> wrote:
>
> Hi Jim,
>
> Am 27.11.20 um 21:38 schrieb Jim Jagielski:
>> I don't think that patch is needed anymore... IIRC it removed cygwin_conv_to_posix_path, which is already done in dmake-4.13
> Now I get this error and dmake does not build (in Cygwin 64):
>
> ---
>
> sysintf.c: In function ‘cygdospath’:
> sysintf.c:1151:17: warning: implicit declaration of function
> ‘cygwin_conv_to_win32_path’; did you mean ‘cygwin_conv_path’?
> [-Wimplicit-function-declaration]
>  1151 |       int err = cygwin_conv_to_win32_path(src, buf);
>       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
>       |                 cygwin_conv_path
>
> ...
>
> /usr/lib/gcc/x86_64-pc-cygwin/10/../../../../x86_64-pc-cygwin/bin/ld:
> sysintf.o: in function `cygdospath':
> /cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0/sysintf.c:1151:
> undefined reference to `cygwin_conv_to_win32_path'
> /cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0/sysintf.c:1151:(.text+0x1203):
> relocation truncated to fit: R_X86_64_PC32 against undefined symbol
> `cygwin_conv_to_win32_path'
> collect2: error: ld returned 1 exit status
> make[2]: *** [Makefile:584: dmake.exe] Error 1
> make[2]: Leaving directory
> '/cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0'
> make[1]: *** [Makefile:661: all-recursive] Error 1
> make[1]: Leaving directory
> '/cygdrive/c/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/dmake-4.13.0'
> make: *** [Makefile:427: all] Error 2
>
> ---
>
> Regards,
>
>    Matthias
>
>>
>>
>>
>>> On Nov 27, 2020, at 1:14 PM, Matthias Seidel <[hidden email]> wrote:
>>>
>>> Additionally, since this happens when building on Windows, the patch
>>> seems to be:
>>>
>>> /main/solenv/src/dmake-cygwin64.patch
>>>
>>> It was made by Damjan for the planned Windows 64 build.
>>>
>>> Regards,
>>>
>>>   Matthias
>>>
>>> Am 27.11.20 um 18:41 schrieb Matthias Seidel:
>>>> Hi Jim,
>>>>
>>>> Tried with dmake 4.13.0:
>>>>
>>>> making and entering
>>>> C:/Source/openoffice/main/solenv/wntmsci12.pro/misc/build/
>>>> unpacking
>>>> /cygdrive/c/Source/openoffice/ext_sources/07927163cc251770d2624d816f2e9b9e-dmake-4.13.0.tar.gz
>>>> entering dmake-4.13.0
>>>> patching file path.c
>>>> Hunk #1 FAILED at 317.
>>>> 1 out of 1 hunk FAILED -- saving rejects to file path.c.rej
>>>> patching file sysintf.c
>>>> Hunk #1 FAILED at 69.
>>>> Hunk #2 FAILED at 538.
>>>> Hunk #3 succeeded at 1148 (offset 4 lines).
>>>> 2 out of 3 hunks FAILED -- saving rejects to file sysintf.c.rej
>>>>
>>>> Are these patches still needed?
>>>>
>>>> Regards,
>>>>
>>>>   Matthias
>>>>
>>>> Am 27.11.20 um 15:32 schrieb [hidden email]:
>>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>>
>>>>> jim pushed a commit to branch trunk
>>>>> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>>>>>
>>>>>
>>>>> The following commit(s) were added to refs/heads/trunk by this push:
>>>>>    new 6d55344  New URL for dmake
>>>>> 6d55344 is described below
>>>>>
>>>>> commit 6d55344ade3d5a22c457d996194d8d8a0bbeee82
>>>>> Author: Jim Jagielski <[hidden email]>
>>>>> AuthorDate: Fri Nov 27 09:32:21 2020 -0500
>>>>>
>>>>>   New URL for dmake
>>>>> ---
>>>>> main/configure.ac | 2 +-
>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/main/configure.ac b/main/configure.ac
>>>>> index 430b796..8b54a22 100644
>>>>> --- a/main/configure.ac
>>>>> +++ b/main/configure.ac
>>>>> @@ -28,7 +28,7 @@ AC_ARG_WITH(dmake-path,
>>>>> ])
>>>>> AC_ARG_WITH(dmake-url,
>>>>> [  --with-dmake-url=<URL>   Specify the location of downloadable dmake source code. For example:
>>>>> -                          https://sourceforge.net/projects/oooextras.mirror/files/dmake-4.12.tar.bz2
>>>>> +                          https://github.com/jimjag/dmake/archive/v4.13.0/dmake-4.13.0.tar.gz
>>>>>                          Note that dmake is under GPL license.],
>>>>> [  DMAKE_URL="$withval"
>>>>> ])
>>>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]