Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Eric Sandall 
<sandalle AT sourcemage.org>:

 xorg-lib/libxcb/FINAL       |   13 +++++++++++++
 xorg-lib/libxcb/HISTORY     |    6 ++++++
 xorg-lib/libxcb/UP_TRIGGERS |    6 +++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

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

    libxcb: Fix Bug #15104 by cleaning up .la files
    Check for 1.2, 1.3, and 1.4 as those are the version since test
    Check for all version changes of 1.2, 1.3 and 1.4
    (the changes from devel-xorg-modular -> test, which had 1.1)

diff --git a/xorg-lib/libxcb/FINAL b/xorg-lib/libxcb/FINAL
index 5adb6df..e0f9aef 100755
--- a/xorg-lib/libxcb/FINAL
+++ b/xorg-lib/libxcb/FINAL
@@ -2,3 +2,16 @@ message "${MESSAGE_COLOR}It's possible to workaround a bug 
when application
 crashes with something like:
 ... xcb_xlib_unlock: Assertion \`c->xlib.lock' failed.
 Just export LIBXCB_ALLOW_SLOPPY_LOCK=1${DEFAULT_COLOR}"
+
+# Using OLD_SPELL_VERSION from UP_TRIGGERS
+if [[ ${OLD_SPELL_VERSION:0:3} != ${VERSION:0:3} ]] &&
+   [[ ${VERSION:0:3} == 1.2 ||
+      ${VERSION:0:3} == 1.3 ||
+      ${VERSION:0:3} == 1.4    ]]
+then
+  message "${MESSAGE_COLOR}Running fix for Bug #15104...${DEFAULT_COLOR}"
+  find $INSTALL_ROOT/usr/lib -name "*.la" -exec sed -e \
+  "s:-lxcb-xlib:: ; s:/usr/lib/libxcb-xlib.la::" -i \{\} \;
+  find $INSTALL_ROOT/usr/lib -name "*.la" -exec sed -e \
+  "s:/usr/lib/libxcb-render-util.la::" -i.libxcb-render-util.la \{\} \;
+fi
diff --git a/xorg-lib/libxcb/HISTORY b/xorg-lib/libxcb/HISTORY
index 64f0d90..b468258 100644
--- a/xorg-lib/libxcb/HISTORY
+++ b/xorg-lib/libxcb/HISTORY
@@ -1,3 +1,9 @@
+2009-07-31 Eric Sandall <sandalle AT sourcemage.org>
+       * FINAL: Fix Bug #15104 by cleaning up .la files
+         Check for 1.2, 1.3, and 1.4 as those are the version since test
+       * UP_TRIGGERS: Check for all version changes of 1.2, 1.3 and 1.4
+         (the changes from devel-xorg-modular -> test, which had 1.1)
+
 2009-07-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.4
          SOURCE matches upstream posted MD5
diff --git a/xorg-lib/libxcb/UP_TRIGGERS b/xorg-lib/libxcb/UP_TRIGGERS
index 63ec7e9..8f87ace 100755
--- a/xorg-lib/libxcb/UP_TRIGGERS
+++ b/xorg-lib/libxcb/UP_TRIGGERS
@@ -1,7 +1,11 @@
 local OLD_SPELL_VERSION=""
 if spell_ok $SPELL; then
   OLD_SPELL_VERSION="$(installed_version $SPELL)"
-  if [[ ${OLD_SPELL_VERSION:0:3} != ${VERSION:0:3} ]] && [[ ${VERSION:0:3} 
== 1.2 ]]; then
+  if [[ ${OLD_SPELL_VERSION:0:3} != ${VERSION:0:3} ]] &&
+     [[ ${VERSION:0:3} == 1.2 ||
+        ${VERSION:0:3} == 1.3 ||
+        ${VERSION:0:3} == 1.4    ]]
+  then
     message "This is a possibly incompatible update of $SPELL..."
     message "Figuring out what spells need to be recast, this may take a 
while."
     for each in $(show_up_depends $SPELL); do