On 2020-01-10 14:53, Matthias Seidel wrote: > 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?)
It's straight from recent git clone but I applied the changes manually. Some crap crept into external_dps.lst but I cleaned them up with successive commits. Do feel free to ignore any irrelevant change that might have crept in. Pedro. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
