Re: Patch for a new feature : sozi

[Paul Chavent <paul chavent fnac net>]

Hi dia ml

Here is the last patch for the sozi feature.
There should be no more problems for applying the patches, and i had some minor fixes.
I also pushed on gitorious a branch : git gitorious org:dia_sozi/dia_sozi.git : sozi

Thanks Hans for your patience.

Feel free to feedback.

Regards.

Paul.

On 09/25/2011 04:26 PM, Hans Breuer wrote:
> Hi Paul,
> sorry for the delay, I wanted to doublecheck the result of applying your patch on Linux and than forgot about 
> it.
>
> At 14.09.2011 00:04, Paul Chavent wrote:
> [...]
> > Hello mailing list.
> >
> > I give you a new version of the sozi patch.
> >
> > I fixed the long lines issue.
> > I replaced gsnprintf by gstrdup and g_ascii_formatd().
> This looks good and I would have commited your patch to git, but it does not apply for me consistently on 
> Windows and Linux:
>
> """
> git apply --whitespace=fix 0002-Add-sozi-front-end.patch
> 0002-Add-sozi-front-end.patch:28: trailing whitespace.
> tree.c \
> 0002-Add-sozi-front-end.patch:29: trailing whitespace.
> sozi-frame.c
> 0002-Add-sozi-front-end.patch:38: trailing whitespace.
> pixmaps/tree.xpm \
> 0002-Add-sozi-front-end.patch:39: trailing whitespace.
> pixmaps/sozi-frame.xpm
> 0002-Add-sozi-front-end.patch:51: trailing whitespace.
> extern DiaObjectType sozi_frame_type;
> fatal: git apply: bad git-diff - expected /dev/null on line 66
> """
>
> The error message from git isn't particular useful, because it has exactly that on line 66. Switching to "git 
> am" does not work either:
>
> """
> git am 0002-Add-sozi-front-end.patch
> Patch format detection failed.
> """
>
> So I'm out of ideas (except for manually merging it) ...
>
> > I hope new feedbacks.
>
> -------- Hans "at" Breuer "dot" Org -----------
> Tell me what you need, and I'll tell you how to
> get along without it. -- Dilbert
> _______________________________________________
> dia-list mailing list
> dia-list gnome org
> http://mail.gnome.org/mailman/listinfo/dia-list
> FAQ at http://live.gnome.org/Dia/Faq
> Main page at http://live.gnome.org/Dia

Attachment: 0001-Add-text-properties-widget.patch
Description: Text document

Attachment: 0002-Add-sozi-front-end.patch
Description: Text document

Attachment: 0003-Set-svg-font-size-unit-to-px.patch
Description: Text document