Bugzilla – Bug 2793
gnome-session-01-gnome-atom.diff fails to apply to gnome-session-2.23.6
Last modified: 2008-08-13 11:02:11 UTC
You need to log in before you can comment on or make changes to this bug.
It fails right from the start: pkgbuild: + echo 'Patch #1 (gnome-session-01-gnome-atom.diff):' pkgbuild: Patch #1 (gnome-session-01-gnome-atom.diff): pkgbuild: + /usr/bin/gpatch --fuzz=0 --unified -p 1 pkgbuild: patching file gnome-session/main.c pkgbuild: Hunk #1 FAILED at 15. pkgbuild: Hunk #2 FAILED at 92. pkgbuild: Hunk #3 FAILED at 118. pkgbuild: 3 out of 3 hunks FAILED -- saving rejects to file gnome-session/main.c.rej The spec file has not been bumped.
CC patch owner Ghee.
Fixed the patch and now the following still need to be patched: -04- (Erwann, those it is not applied anyway, can it be removed?) -05- (Erwann, do not apply) -07- (Erwann, partially applied) -08-(Erwannm do not apply) -09- (Brian, no longer required can be removed) -10- (Simon, partially applied) -11- (Ghee/Stepen, partially applied)
Created an attachment (id=398) [details] patches/gnome-session-01-gnome-atom.diff
Created an attachment (id=399) [details] patches/gnome-session-02-gnome-about.diff
Created an attachment (id=400) [details] patches/gnome-session-03-wait-for-postrun.diff
Created an attachment (id=401) [details] patches/gnome-session-10-logout-dialog.diff
Since we are still awaiting a number of patches to be reworked. So now I am attaching patches that have been reworked and revert back version of gnome-session tarball from 2.23.6 to 2.23.5 which does contain patches that worked. Attached are reworked patches for 2.23.6: patches/gnome-session-01-gnome-atom.diff patches/gnome-session-02-gnome-about.diff patches/gnome-session-03-wait-for-postrun.diff patches/gnome-session-10-logout-dialog.diff
Erwann has ported all his patches. I have tried out the other commented out patches, the only one that does not applied is patches/gnome-session-11-trusted-extensions.diff I am working on it.
All patches now reworked renumbered.