Re: [orca-list] Applying Patches

[Juanje Ojeda <jojeda emergya es>]

Hi Jon,

I've changed the name of the patch file at the bash function, because
it wasn't the same that the example. I mean, the function call the
file 'patch.120249' and the example use '120249.patch' (which makes
more sense), so you couldn't run the example without fails...

Anyways, I changed that (I hope you don't mind) and i've added a
patches with Git subsection. Feel free to fix all the mistakes I've
probably made.
I hope it be clear enough for the newbie or the maintainers.

Greetings

2010/5/20 Jon <j orcauser googlemail com>:
> Dear Juanje,
>
> Intrestingly enough i was getting irritated with bugzilla, and just found
> git bz a few days ago.
> Hopefully it should make us more productive.
>
> It would be really grate if you could update the wiki with the new information.
>
> Thanks for your time.
>
> -Jon
>
> On Wed 19/05/2010 at 17:18:35, Juanje Ojeda wrote:
> > Hi,
> >
> > 2010/5/19 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.
> >
> > Actually, maybe the best way to do it with the whole new Git thing is
> > using 'git-bz'[1]. From its documentation[2]:
> > # Apply patches from the given bug (ie: bug 1234)
> > git bz apply bugzillla.gnome.org:1234
> >
> > I could update the wiki if you like.
> >
> > Greetings
> >
> >
> > [1] http://live.gnome.org/Git/Tips#git_.26_bugzilla
> > [2] http://git.fishsoup.net/cgit/git-bz/tree/git-bz.txt
> > > 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
> > > _______________________________________________
> > > 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
> >
> > --
> > Juanje

-- 
Juanje