[Libreoffice] Build fail in scp2 on Mac - file_font_accessories.par malformed

2011-03-30 Thread Alexander Thurgood
Hi all, When trying to build scp2 on Mac OSX, I get the following error : par2script -i ../unxmacxi.pro/par,/Users/alex/DevHack/git/libo/solver/300/unxmacxi.pro/par @@/var/folders/tQ/tQqvtWX2HoWtouh-ZgKa-k+++TI/-Tmp-//mkYTe8Cu -o ../unxmacxi.pro/bin/osl/setup_osl.ins Reading par files Collecting

Re: [Libreoffice] Build fail in scp2 on Mac - file_font_accessories.par malformed

2011-03-30 Thread Alexander Thurgood
Le 30/03/11 16:22, Alexander Thurgood a écrit : > when I look at the file_font_accessories.par file, all of the URW font > entries have a missing carriage return after the font name and before > the UnixRights = foo, which causes the par2script to barf and the build > to fail. > > The reason is

Re: [Libreoffice] Build fail in scp2 on Mac - file_font_accessories.par malformed

2011-03-30 Thread Caolán McNamara
On Wed, 2011-03-30 at 18:24 +0200, Alexander Thurgood wrote: > The reason is that file_font_accessories.scp contains "-" hyphens all > over the place in the URW and Justus font names, as well as a misplaced > ".ttf" in Tuffy Bold that causes par2script to choke. Can you cook up a fix for us and po

Re: [Libreoffice] Build fail in scp2 on Mac - file_font_accessories.par malformed

2011-03-30 Thread Alexander Thurgood
Well I can try, but (1) I'm not sure that the changes I've made are even correct (it does build though), and (2) I'm not at all conversant with git - do I need a separate tree, or is there a way to compare my file changes with the file on master? Alex __

Re: [Libreoffice] Build fail in scp2 on Mac - file_font_accessories.par malformed

2011-03-31 Thread Caolán McNamara
On Thu, 2011-03-31 at 06:01 +0200, Alexander Thurgood wrote: > Well I can try, but (1) I'm not sure that the changes I've made are > even correct (it does build though) Seeing as it doesn't build with those options right now, that's got to be an improvement anyway :-) > I'm not at all conversant

Re: [Libreoffice] Build fail in scp2 on Mac - file_font_accessories.par malformed

2011-04-04 Thread Alexander Thurgood
Le 31/03/11 10:10, Caolán McNamara a écrit : > > Seeing as it doesn't build with those options right now, that's got to > be an improvement anyway :-) > OK, here's the result of a git-diff on my repo, 2 files have been changed, so I will post them separately : diff --git a/scp2/source/access

Re: [Libreoffice] Build fail in scp2 on Mac - file_font_accessories.par malformed

2011-04-04 Thread Alexander Thurgood
Le 31/03/11 10:10, Caolán McNamara a écrit : Git diff of changes to module_font_accessories.scp : diff --git a/scp2/source/accessories/module_font_accessories.scp b/scp2/source/accessories/module_font_accessories.scp index b2e67a7..b41eb09 100644 --- a/scp2/source/accessories/module_font_accesso