openoffice-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Matthias Seidel <matthias.sei...@hamburg.de>
Subject Re: Update to python-2.17
Date Fri, 10 Jan 2020 19:53:42 GMT
Hi Pedro,

Am 10.01.20 um 20:50 schrieb Pedro Giffuni:
> On 2020-01-10 13:24, Matthias Seidel wrote:
>> Hi Pedro,
>>
>> Am 10.01.20 um 07:14 schrieb Pedro Giffuni:
>>> Hi again;
>>>
>>> On 2020-01-04 05:16, Matthias Seidel wrote:
>>>> Hi Pedro,
>>>>
>>>> Thanks!
>>>>
>>>> Unfortunately the build process just stops at some point (on Windows),
>>>> no error codes I could give you.
>>> The problems are usually related to getting the patches applied
>>> correctly. There can be no hunks or mismatches.
>>>
>>> I tested them one by one and they should be OK now. Same place:
>>>
>>> https://people.apache.org/~pfg/patches/patch-python-2.17.diff
>> When trying to apply this patch to trunk I get:
>>
>>  **** malformed patch at line 2048: Index:
>> main/python/python-2.7.15-msvs9.patch
>>
>> (It would be nice if you could create a Pull Request on GitHub)
> Indeed that patch causes issues due to Windows LF characters. I
> overruled the issue in git and sent the Pull Request:
>
> https://github.com/apache/openoffice/pull/23

Thanks!

What revision is this patch based on?
I see a lot of commits that are already in trunk for longer time...
(However, they should be ignored when merging?)

Regards,

   Matthias

>
> Enjoy!
>
> Pedro.
>
>


Mime
View raw message