sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (9fdf819360f42527be84ac2e2d1ea2c43f212319)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (9fdf819360f42527be84ac2e2d1ea2c43f212319)
Date: Sat, 18 Apr 2009 14:17:59 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

xorg-xserver/xorg-server/HISTORY | 3 +++
xorg-xserver/xorg-server/PRE_BUILD | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9fdf819360f42527be84ac2e2d1ea2c43f212319
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Don't apply gnome.patch twice

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 6bd3e31..2698a25 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+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

diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index b54f753..03db7ae 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -4,7 +4,6 @@ glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
unpack_file 2 &&
patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
-patch -p1 < $SPELL_DIRECTORY/gnome.patch &&
if [[ "$XORG_SERVER_MESA_PATH_PATCH" == "t" ]] ; then
patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch" &&
# according to lynx^3 this is necessary

[SM-Commit] GIT changes to master grimoire by Eric Sandall (9fdf819360f42527be84ac2e2d1ea2c43f212319), Eric Sandall, 04/18/2009