http://www.miscdebris.net/plplot_wiki/index.php?action=history&feed=atom&title=Apply_a_patch 2026-05-16T02:47:03Z Revision history for this page on the wiki MediaWiki 1.24.4 http://www.miscdebris.net/plplot_wiki/index.php?title=Apply_a_patch&diff=2180&oldid=prev 2009-08-24T19:02:04Z

<p></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black; text-align: center;">← Older revision</td> <td colspan='2' style="background-color: white; color:black; text-align: center;">Revision as of 19:02, 24 August 2009</td> </tr><tr><td colspan="2" class="diff-lineno">Line 19:</td> <td colspan="2" class="diff-lineno">Line 19:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>actually patching cairo.c)</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>actually patching cairo.c)</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr> <tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>software@raven&gt; patch --dry-run -p1 \</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline"> </ins>software@raven&gt; patch --dry-run -p1 \</div></td></tr> <tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>&lt; /home/irwin/cairo-xcairo-offscreen-rendering-v2.patch</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline"> </ins>&lt; /home/irwin/cairo-xcairo-offscreen-rendering-v2.patch</div></td></tr> <tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>patching file drivers/cairo.c</div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline"> </ins>patching file drivers/cairo.c</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>The lack of further messages after the &quot;patching file&quot; message indicates the</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>The lack of further messages after the &quot;patching file&quot; message indicates the</div></td></tr> </table>

Smekal http://www.miscdebris.net/plplot_wiki/index.php?title=Apply_a_patch&diff=2179&oldid=prev 2009-08-24T18:59:50Z

<p>Created page with &#039;The key elements to pay attention to with the patch application are to make sure you are in the proper directory within the source tree, and the --dry-run and -p options for patc…&#039;</p> <p><b>New page</b></p><div>The key elements to pay attention to with the patch application are to make<br /> sure you are in the proper directory within the source tree, and the<br /> --dry-run and -p options for patch such as -p0, -p1, etc. Basically, the<br /> number after the -p option is the number of subdirectory prefixes to strip<br /> off the file names in the patch. Hez&#039;s current patch has file names<br /> a/drivers/cairo.c and b/drivers/cairo.c so you apply -p1 to strip off just<br /> the a/ and b/ from the names and patch will find drivers/cairo.c to patch<br /> _IF_ you are in the top-level of the source tree. However, if you are in the<br /> drivers subdirectory of the source tree, then you have to use -p2 to strip<br /> off a/drivers/ and b/drivers from the cairo.c name. Hope that makes sense.<br /> The --dry-run option lets you know (a) whether the files to be patched can<br /> be found (i.e., whether you are in a directory that is consistent with the<br /> -p option you have used), and (b) whether the patch applies cleanly to those<br /> files (without actually applying the patch). In any case just remember that<br /> --dry-run gives you a chance to experiment with different -p numbers until<br /> you discover the correct one for the directory that you are in.<br /> <br /> Here is how I discovered that Hez&#039;s patch would apply cleanly (without<br /> actually patching cairo.c)<br /> <br /> software@raven&gt; patch --dry-run -p1 \<br /> &lt; /home/irwin/cairo-xcairo-offscreen-rendering-v2.patch<br /> patching file drivers/cairo.c<br /> <br /> The lack of further messages after the &quot;patching file&quot; message indicates the<br /> file was found and the patch would apply cleanly. Remove the --dry-run<br /> option when you actually are ready to apply the patch. After you apply the<br /> patch and evaluate it, you might want to remove it again from your source<br /> tree . For that, you use the --reverse option of patch (which reverses the<br /> effect of the patch). Of course, again, you would first want to use the<br /> --dry-run and --reverse options combined to make sure you are in the right<br /> directory with a consistent -p number used before you remove the --dry-run<br /> option.</div>

Smekal