Evenin' all I'm trying to patch the CVS with the tab patch but I haven't used patch much. The problem I'm haveing is that I don't know which directory to run the path from, it keeps complaining that it can't find the file to patch Cheers Nigel
On Thu, 28 Aug 2003 20:35:27 +0100 Nigel Wilkinson <nigel@waspz.plus.com> wrote:
Evenin' all
I'm trying to patch the CVS with the tab patch but I haven't used patch much. The problem I'm haveing is that I don't know which directory to run the path from, it keeps complaining that it can't find the file to patch
You need to cd to the dillo directory before applying the patch: Assuming you have dillo CVS in /usr/src/dillo-cvs/dillo, and you do NOT want to apply the patch over the CVS directory itself (good idea, as you might want to update the CVS later...): % cd /usr/src/dillo-cvs (or whereever the dillo directory resides) % cp -rd dillo dillo_tabs (this copies the CVS dir to a new dir) % cd dillo_tabs (go to the new dir) % zcat dillo-20030821-tabs.patch.gz | patch -p1 (apply patch) % ./autogen.sh (generate configure and Makefile.in) % ./configure (with whatever options you prefer) % make % make install Easy, not? Cheers//Frank -- WWWWW ________________________ ## o o\ / Frank de Lange \ }# \| / +46-734352015 \ \ `--| _/ <Hacker for Hire> \ `---' \ +31-640037120 / \ frank@unternet.org / `------------------------' [ "Omnis enim res, quae dando non deficit, dum habetur et non datur, nondum habetur, quomodo habenda est." ]
On Thu, 28 Aug 2003 22:19:29 +0200 Frank de Lange <frank@unternet.org> wrote:
You need to cd to the dillo directory before applying the patch:
Assuming you have dillo CVS in /usr/src/dillo-cvs/dillo, and you do NOT want to apply the patch over the CVS directory itself (good idea, as you might want to update the CVS later...):
% cd /usr/src/dillo-cvs (or whereever the dillo directory resides) % cp -rd dillo dillo_tabs (this copies the CVS dir to a new dir) % cd dillo_tabs (go to the new dir) % zcat dillo-20030821-tabs.patch.gz | patch -p1 (apply patch) % ./autogen.sh (generate configure and Makefile.in) % ./configure (with whatever options you prefer) % make % make install
Great, worked a treat but just for my info where was I going wrong in the following 1. I was gunzipping the patch file 2. I was useing 'patch < dillo-20030821-tabs.patch' if my CVS source was in ~/Source/dillo I tried this from ~/Source, ~/Source/dillo, and ~/Source/dillo/src I also tried the above as 'patch -p1 < dillo-20030821-tabs.patch' as well as -p2, -p3 etc The command 'patch < dillo-20030821-tabs.patch' came from the man page so I just wondered why it didn't work. If I understand things correctly in the command 'zcat dillo-20030821-tabs.patch.gz | patch -p1' that worked zcat decompresses the zipped dillo patch and pipes it to patch. Why is this different from 'patch -p1 < dillo-20030821-tabs.patch' Cheers Nigel
On Thu, 28 Aug 2003 22:00:26 +0100 Nigel Wilkinson <nigel@waspz.plus.com> wrote:
Great, worked a treat but just for my info where was I going wrong in the following
1. I was gunzipping the patch file 2. I was useing 'patch < dillo-20030821-tabs.patch' if my CVS source was in ~/Source/dillo I tried this from ~/Source, ~/Source/dillo, and ~/Source/dillo/src I also tried the above as 'patch -p1 < dillo-20030821-tabs.patch' as > well as -p2, -p3 etc
The command 'patch < dillo-20030821-tabs.patch' came from the man page > so I just wondered why it didn't work.
Well, this should also work: (on a clean, non-patched, not even partly patched source tree) cd ~/Source/dillo patch -p1 < /path/to/dillo-20030821-tabs.patch If it did not, either your source or uncompressed patch is not what it should be. Or you forgot to give the exact path to the patch file?
If I understand things correctly in the command 'zcat > dillo-20030821-tabs.patch.gz | patch -p1' that worked zcat decompresses the zipped dillo patch and pipes it to > patch. Why is this different from 'patch -p1 < dillo-20030821-tabs.patch'
There is no real difference (zcat is more practical, as you do not have to uncompress the patch). Both commands should have the same results. If not, something weird is happening. Cheers//Frank -- WWWWW ________________________ ## o o\ / Frank de Lange \ }# \| / +46-734352015 \ \ `--| _/ <Hacker for Hire> \ `---' \ +31-640037120 / \ frank@unternet.org / `------------------------' [ "Omnis enim res, quae dando non deficit, dum habetur et non datur, nondum habetur, quomodo habenda est." ]
participants (2)
-
Frank de Lange -
Nigel Wilkinson