Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e784fe92a9ca33f3008ed70ad89b3723c618da9a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e784fe92a9ca33f3008ed70ad89b3723c618da9a)
  • Date: Thu, 4 Sep 2008 13:44:33 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

xorg-xserver/xorg-server/HISTORY | 4 ++++
xorg-xserver/xorg-server/UP_TRIGGERS | 13 ++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit e784fe92a9ca33f3008ed70ad89b3723c618da9a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

xorg-server: lessen the bork some more
UP_TRIGGERS: don't trigger spells we depend on
don't use spell as a variable, bad things happen

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 4c21a36..369ca85 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2008-09-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: don't trigger spells we depend on
+ don't use spell as a variable, bad things happen
+
2008-08-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* UP_TRIGGERS: fixed this braindead pos
don't fail if there's nothing to up_trigger
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS
b/xorg-xserver/xorg-server/UP_TRIGGERS
index 65254b7..6970bbd 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -2,16 +2,16 @@
# Go through each provider monolithic X spells provided
#
local provider
-local spell
+local each

for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb; do
- for spell in $(gaze -q depends $provider 1); do
+ for each in $(gaze -q depends $provider 1); do
#
# Recast each spell still using monolithic X, if it's installed
# See http://bugs.sourcemage.org/show_bug.cgi?id=14373 for the "issue"
# with Sorcery not switching out a no longer available provider
#
- up_trigger $spell cast_self
+ up_trigger $each cast_self
done # Finished spell loop
done # Finished provider loop

@@ -19,9 +19,8 @@ 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 &&
-for spell in mesalib synaptics $(gaze -q section xorg-driver) \
- xkbutils xkbcomp xkbprint xkbevd libxkbui libxkbfile xkeyboard-config
setxkbmap; do
- if spell_ok $spell; then
- up_trigger $spell check_self
+for each in synaptics $(gaze -q section xorg-driver); do
+ if spell_ok $each; then
+ up_trigger $each check_self
fi
done



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e784fe92a9ca33f3008ed70ad89b3723c618da9a), Jaka Kranjc, 09/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page