Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <eric AT sandall.us>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5d08b0e631f1f78f5c2074ba1216f2d045f19a9d)
  • Date: Sat, 18 Apr 2009 14:51:52 -0700

On Sat, 18 Apr 2009 15:34:07 -0500
Eric Sandall <scm AT sourcemage.org> wrote:

> GIT changes to master grimoire by Eric Sandall
> <sandalle AT sourcemage.org>:
>
> xorg-xserver/xorg-server/CONFIGURE
> | 7
> xorg-xserver/xorg-server/DETAILS
> | 5
> xorg-xserver/xorg-server/HISTORY
> | 14 -
> xorg-xserver/xorg-server/PRE_BUILD
> | 9
> xorg-xserver/xorg-server/gl_select.patch
> | 48 ++---
> xorg-xserver/xorg-server/gnome.patch
> | 93 ----------
> xorg-xserver/xorg-server/xorg-server-mesa.patch
> | 10 - 13 files changed, 46 insertions(+), 156 deletions(-)
>
> New commits:
>
> commit a374fd404c0e409139b99075d1667a4bba9ce5b2
> Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> xorg-server: updated to 1.6.1
>
> Cherry-picked from 6eaaad23a5f81b323107c9d7101538c04c303e6b in
> devel-xorg-modular
>
> commit 817b8e4a6b77b0cbad23105df83094a0d4662903
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> Revert "xorg-server: apply patch to fix gnome 2.26 CPU usage
> issue"
> This reverts commit e133365645aeb649de515f86dba23cb6298753c0.
>
> Preparing for 1.6.1 which already has this fix
>
> Conflicts:
>
> xorg-xserver/xorg-server/gnome.patch
>
> commit 1235e2e91f5a9d716b51b4f18b31a8b3cac89607
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> Revert "xorg-server: apply patch to fix gnome 2.26 CPU usage
> issue"
> This reverts commit e133365645aeb649de515f86dba23cb6298753c0.
>
> Prepare for 1.6.1 which already has this fix
>
> Conflicts:
>
> xorg-xserver/xorg-server/HISTORY
> xorg-xserver/xorg-server/gnome.patch
>
> commit be36e498c71b4972bdc7c6092e696916d6248341
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> Revert "xorg-server: Don't apply gnome.patch twice"
>
> This reverts commit 9fdf819360f42527be84ac2e2d1ea2c43f212319.
>
> Preparing for xorg 1.6.1 which already has this fix.
>
> a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
> index 2698a25..dd97dc6 100644 --- a/xorg-xserver/xorg-server/HISTORY
> +++ b/xorg-xserver/xorg-server/HISTORY
> @@ -1,12 +1,8 @@
> -2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
> - * PRE_BUILD: Don't apply gnome.patch twice
> -
> -2009-04-18 Robin Cook <rcook AT wyrms.net>
> - * gnome.patch: copy correct patch file
> -
> -2009-04-17 Robin Cook <rcook AT wyrms.net>
> - * PRE_BUILD: apply patch to fix gnome 2.26 cpu issue bug
> #573472
> -
> http://cgit.freedesktop.org/xorg/xserver/commit/?id=1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
> +2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> + * DETAILS: updated spell to 1.6.1
> + * xorg-server-mesa.patch: removed
> + * PRE_BUILD: removed the patch
> + * gl_select.patch: updated

I am unsure if reverting and then integrating the new version was the
correct approach, though it was the easiest with all the conflicts I
ran in to. Would a better approach have been to integrate the 1.6.1
update and merge the conflict by removing the 1.5.3 patchset, leaving
HISTORY untouched?

-sandalle

--
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us PGP: 0xA8EFDD61 | http://www.sourcemage.org/
http://eric.sandall.us/ | http://counter.li.org/ #196285

Attachment: signature.asc
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page