Re: [orca-list] Applying Patches

[Jon <j orcauser googlemail com>]

Hi Paul,

patch -p0 was correct for svn, -p1 is the correct for git patches.

Thanks for your time :)
It would be great if you could update the wiki to show the updated function, and any information you feel 
might be useful.

-Jon

On Wed 19/05/2010 at 15:06:58, Paul Hunt wrote:
> Hi all,
>
> I need some help with applying patches from bugzilla to Orca.
>
> I have the Orca git repo cloned in ~/apps/orca and it's currently
> pointed at the head of the master branch.
>
> I want to test the opentts patch Steve made (attached to bug 618927).
>
> I followed the instructions at
> http://live.gnome.org/Orca/HowCanIHelp which tells you how to write
> a function to put in your ~/.bashrc that will download patches for
> you.
>
> I had to change the URL because it seems that it has changed since
> the function was written but I've got it working now and I've got
> the patch in my /apps/orca/patches directory.
>
> But when I go to my apps/orca directory and try to apply it with the command
>
> patch -p0 < patches/patch.161312
>
> it fails.
>
> The openttsfactory file is created, although it doesn't go into the
> src/orca directory it goes into a directory called b/src/orca, and
> the single line changes to Makefile.am and settings.py are rejected.
>
> Can someone help?  I'd like to get onboard helping out with the
> switch to opentts for Orca.
>
> Cheers.
> Paul
> _______________________________________________
> orca-list mailing list
> orca-list gnome org
> http://mail.gnome.org/mailman/listinfo/orca-list
> Visit http://live.gnome.org/Orca for more information on Orca.
> The manual is at http://library.gnome.org/users/gnome-access-guide/nightly/ats-2.html
> The FAQ is at http://live.gnome.org/Orca/FrequentlyAskedQuestions
> Netiquette Guidelines are at http://live.gnome.org/Orca/FrequentlyAskedQuestions/NetiquetteGuidelines
> Log bugs and feature requests at http://bugzilla.gnome.org
> Find out how to help at http://live.gnome.org/Orca/HowCanIHelp