Bugzilla – Bug 2140
gnome-session-01-gnome-atom.diff fails to apply to 2.23.3
Last modified: 2008-07-21 09:07:13 UTC
You need to log in before you can comment on or make changes to this bug.
gnome-session appears to have changed dramatically for 2.23 so the patches start failing right from the start.
Niall, please remove gnome-session-13-logout-shutdown-dialog.diff for gnome-session 2.23 because this patch is backport from upstream(v2.23). Thanks.
Niall - ping. This bug has been open for almost 2 weeks. The agreed turnaround time is a few days.
*** Bug 2260 has been marked as a duplicate of this bug. ***
This new release of gnome-session has a build dependency on gnome-keyring >= 2.1.92. I've contacted Ghee concerning bumping gnome-keyring.
I've bumped the tarball version to 2.23.4 and fixed gnome-session-01-gnome-atom.diff to apply to the new tarball. As noted much more work is needed however and the I've contacted the respective patch owners to ask them to evaluate their patches. I'm leaving this bug open to track the remaining patches that fail to apply. This is a summary of the patch status: gnome-session-01-gnome-atom.diff : Ported. Alo: gnome-session-02-logout-effect.diff: Needs to be evaluated. I don't think the new gnome-session has any kind of logout effect. Brian: gnome-session-03-gnome-about.diff: Needs to be reworked. gnome-session-04-wait-for-postrun.diff: Ported. Stephen/Ghee: gnome-session-05-trusted-extensions.diff: This one should probably be thrown out the window and started from scratch :) gnome-session-06-gnome-volcheck-default-session.diff: Dropped because we dropped gnome-volcheck a long time ago. Erwann: gnome-session-07-busy-cursor.diff gnome-session-08-solaris-branding.diff: Both need porting. Brian: gnome-session-09-find-dbus-daemon.diff: I dropped this since gnome-session now launches dbus-launch instead of dbus-daemon so it should always be in the user's $PATH Jeff: gnome-session-10-disable-ssh.diff: Needs to be ported or dropped if applicable. gnome-session-11-Xsession.diff: Applies cleanly. Erwann: gnome-session-12-compiz-integration.diff gnome-session-13-indiana-splash-hack.diff: Both need porting.
SUNWtgnome-xagent fails too pkgbuild: + echo 'Patch #1 (SUNWtgnome-xagent-01-trusted-extensions.diff):' pkgbuild: Patch #1 (SUNWtgnome-xagent-01-trusted-extensions.diff): pkgbuild: + /usr/bin/gpatch --fuzz=0 --unified -p 1 pkgbuild: patching file gnome-session/Makefile.am pkgbuild: Hunk #1 FAILED at 4. pkgbuild: Hunk #2 FAILED at 36. pkgbuild: Hunk #3 FAILED at 54. pkgbuild: Hunk #4 FAILED at 135. pkgbuild: 4 out of 4 hunks FAILED -- saving rejects to file gnome-session/Makefile.am.rej
All remainign patches bar the trusted extensions patch have been ported now. I'm reassigning this bug to Stephen who is going to work on getting the trusted-extensions patch ported.