Comment 198 for bug 195698

Revision history for this message
In , oneguycoding (steeve-oneguycoding) wrote :

Sure, good idea :) I reversed the patches in the redhat/BUILD directory for both 326390 and 329486. Note the offsets in 329486 which were there also when I applied the patch. The redhat src rpm firefox-3.0.1-1.fc9.src.rpm used firefox-3.0.1-source.tar.bz2. Which source tarball did you use?

[root@linguini mozilla]# patch -R -p1 --dry-run < /data/src/firefox/patch.326390.diff
patching file embedding/browser/photon/src/PromptService.cpp
patching file embedding/components/windowwatcher/public/nsPIPromptService.idl
patching file embedding/components/windowwatcher/src/nsPromptService.cpp
patching file embedding/components/windowwatcher/src/nsPromptService.h
[root@linguini mozilla]# patch -R -p1 --dry-run < /data/src/firefox/patch.329486.diff
patching file netwerk/protocol/http/src/nsHttpChannel.cpp
Hunk #1 succeeded at 118 (offset -1 lines).
Hunk #2 succeeded at 2633 (offset -161 lines).
Hunk #3 succeeded at 2924 (offset -1 lines).
Hunk #4 succeeded at 2792 (offset -161 lines).
Hunk #5 succeeded at 3085 (offset -1 lines).
Hunk #6 succeeded at 2965 (offset -161 lines).
Hunk #7 succeeded at 3290 (offset -1 lines).
patching file netwerk/protocol/http/src/nsHttpChannel.h
Hunk #1 succeeded at 214 (offset -6 lines).
Hunk #2 succeeded at 305 (offset -9 lines).
patching file netwerk/protocol/http/src/nsHttpHandler.cpp
patching file netwerk/protocol/http/src/nsHttpHandler.h
[root@linguini mozilla]# pwd
/usr/src/redhat/BUILD/firefox-3.0.1/mozilla