[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0bbb22940134a16e40ff3b6c317fb4a3e5b2a1e3)

Vlad Glagolev scm at sourcemage.org
Mon Oct 13 18:48:23 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 xorg-xserver/xorg-server/FINAL       |   22 +++-------------------
 xorg-xserver/xorg-server/HISTORY     |    7 +++++++
 xorg-xserver/xorg-server/INSTALL     |    4 ----
 xorg-xserver/xorg-server/UP_TRIGGERS |   17 +++++++++++------
 4 files changed, 21 insertions(+), 29 deletions(-)

New commits:
commit 0bbb22940134a16e40ff3b6c317fb4a3e5b2a1e3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xorg-server: UP_TRIGGERS' FIXAGE

diff --git a/xorg-xserver/xorg-server/FINAL b/xorg-xserver/xorg-server/FINAL
index 88090ee..9eee4b8 100755
--- a/xorg-xserver/xorg-server/FINAL
+++ b/xorg-xserver/xorg-server/FINAL
@@ -1,21 +1,5 @@
-# !!!HACK ALERT!!!
-# breaknig some other spells so that check_self produces
-# desired result
-# !!!HACK ALERT!!!
-
-#rm -f $INSTALL_ROOT/usr/lib/libxkbfile.so
-#rm -f $INSTALL_ROOT/usr/lib/libxkbui.so
-#rm -f $INSTALL_ROOT/usr/bin/setxkbmap
-#rm -f $INSTALL_ROOT//usr/bin/xkbcomp
-
-#smgl-gl_select -s mesa
-#Temporary until this is finalized by the smgl-gl_select
-#ln -vfs ${TRACK_ROOT}/usr/include/GL/mesa/*.h                    \
-#        ${TRACK_ROOT}/usr/include/GL/                            &&
-#ln -vfs ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/mesa/*     \
-#        ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/
-
 message "${PROBLEM_COLOR}"
-message "WARNING: if you have path defined by RgbPath var in /etc/X11/xorg.conf"
-message "-- remove it. Since xorg-server 1.5 RgbPath has been marked as obsolete"
+message "WARNING: if you have a path defined by RgbPath var in /etc/X11/xorg.conf"
+message "-- remove it. Since xorg-server 1.5.0 RgbPath has been marked as obsolete"
+message "and it's not used in xorg.conf anymore."
 message "${DEFAULT_COLOR}"
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 3ae7ac2..9820fce 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,10 @@
+2008-10-14 Vlad Glagolev <stealth at sourcemage.org>
+	* INSTALL: removed -- not needed anymore (default_install)
+	* FINAL: removed deprecated comments; cleaned up
+	* UP_TRIGGERS: check_self every spell needed to be checked on casting X
+	  include 1.4.2 in version list where every spell needed to be checked is
+	  casted
+
 2008-10-13 Vlad Glagolev <stealth at sourcemage.org>
 	* UP_TRIGGERS: fixed up_triggerring if any local grimoires exist
 
diff --git a/xorg-xserver/xorg-server/INSTALL b/xorg-xserver/xorg-server/INSTALL
deleted file mode 100755
index 15509a3..0000000
--- a/xorg-xserver/xorg-server/INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-default_install
-#mkdir -vp  $INSTALL_ROOT/usr/lib/xorg/modules/extensions/mesa      &&
-#mv -vf $INSTALL_ROOT/usr/lib/xorg/modules/extensions/libglx.*      \
-#       $INSTALL_ROOT/usr/lib/xorg/modules/extensions/mesa/
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS b/xorg-xserver/xorg-server/UP_TRIGGERS
index 9a9afca..e12fd16 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -3,6 +3,7 @@
 #
 local provider
 local each
+local epicfail
 
 for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb; do
   for each in $(gaze -q depends $provider 1); do
@@ -12,18 +13,22 @@ for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb; do
     # with Sorcery not switching out a no longer available provider
     #
     up_trigger $each cast_self
-  done  # Finished spell loop
-done  # Finished provider loop
+  done # Finished spell loop
+done # Finished provider loop
 
 case "$(installed_version $SPELL)" in
-  1.3.0.0|1.2.99.903|1.2.99.902|1.2.0|1.1.1|1.0.1|1.0.0|0.99.4) true ;;
-  *) false ;;
-esac || return 0 &&
+  1.4.2|1.3.0.0|1.2.99.903|1.2.99.902|1.2.0|1.1.1|1.0.1|1.0.0|0.99.4) epicfail=y;;
+  *) epicfail=n;;
+esac &&
 
 for each in synaptics $(gaze -q -g "$(gaze -q grimoires | tr " " "\n" | \
   grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver) \
   xkbutils xkbcomp xkbprint xkbevd xkeyboard-config setxkbmap; do
   if spell_ok $each; then
-    up_trigger $each check_self
+    if [[ $epicfail == y ]]; then
+      up_trigger $each cast_self
+    else
+      up_trigger $each check_self
+    fi
   fi
 done



More information about the SM-Commit mailing list