[csw-pkgsubmissions] patching made simpler?

rupert THURNER rupert at opencsw.org
Wed Jan 5 20:12:46 CET 2011


On Tue, Dec 7, 2010 at 18:08, Philip Brown <phil at bolthole.com> wrote:
> Yes, this means you would need to generate a local "patch". It's
> really not that difficult.
>
> The GAR patching mechanisms are almost automatic, if you leave the git
> stuff enabled.
> You basically just edit the file, ONE time, then run (some gar magic
> "make patch" command). It does the work of creating a patchfile for
> you.
> svn commit and package
>
> and then future versions will automatically be patched by gar.

when trying to upgrade lzlib, i must have made an error because my
user experience was not "almost automatic". what did i do wrong?

* try to build, not all patches applied
* throw away the old patches, check in
* "gmake extract" to get the source back
* edit the files again like it should be
* "gmake makepatch"
* "gmake package", failed as there is a new file which would need
   patching as well.
* "gmake clean", "gmake extract" again
* edit the file
* "gmake makepatch" again
* "gmake clean", "gmake package" again

then i forgot to delete a line in a file which is already patched, and
i thought about repeating above procedure again:
1. gmake extract
    applied patch 001
2. gmake makepatch
    tried to apply patch 001 again
which failed.

then i gave up for the moment ... but this cannot be it, isn't it?
should we switch to the whole source from subversion to git and it
would be neater? then patches could be rebased instead of applied
newly.

rupert


More information about the pkgsubmissions mailing list