Skip to Content.
Sympa Menu

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

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 (6f2e99b6bd1a9cdefb3d5167d082c20d9d78859f)
  • Date: Sat, 30 Aug 2008 06:17:46 -0500

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

xorg-xserver/xorg-server/HISTORY | 3
xorg-xserver/xorg-server/UP_TRIGGERS | 144
+++--------------------------------
2 files changed, 16 insertions(+), 131 deletions(-)

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

xorg-server/UP_TRIGGERS revamped

1. triggering only for people with 8 different xorg-server versions
installed at the same time is funny
2. a hardcoded list meant missing a few spells
3. gaze depends is different in normal mode in 1.14

Now the file works as intended. Yes, I actually ran it.

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 1f208f5..3234bc5 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2008-08-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: fixed this braindead pos
+
2008-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* CONFIGURE: added xf86-video-intel, thanks Enqlave
* DEPENDS: added xf86-video-intel, thanks Enqlave
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS
b/xorg-xserver/xorg-server/UP_TRIGGERS
index 27dfc50..1e9f477 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -5,141 +5,23 @@ local provider
local spell

for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb; do
- for spell in $(gaze depends $provider 1 | cut -d: -f1); do
+ for spell 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
+ # See http://bugs.sourcemage.org/show_bug.cgi?id=14373 for the "issue"
# with Sorcery not switching out a no longer available provider
#
- if spell_ok $spell; then
- up_trigger $spell cast_self
- fi
+ up_trigger $spell cast_self
done # Finished spell loop
done # Finished provider loop

-# modifying this a bit
-unset provider spell
-
-local provider
-local spell
-
-if spell_ok $SPELL &&
- [[ $(installed_version $SPELL) == 1.3.0.0 ]] &&
- [[ $(installed_version $SPELL) == 1.2.99.903 ]] &&
- [[ $(installed_version $SPELL) == 1.2.99.902 ]] &&
- [[ $(installed_version $SPELL) == 1.2.0 ]] &&
- [[ $(installed_version $SPELL) == 1.1.99.903 ]] &&
- [[ $(installed_version $SPELL) == 1.1.99.902 ]] &&
- [[ $(installed_version $SPELL) == 1.1.1 ]] &&
- [[ $(installed_version $SPELL) == 1.0.1 ]] &&
- [[ $(installed_version $SPELL) == 1.0.0 ]] &&
- [[ $(installed_version $SPELL) == 0.99.4 ]]; then
- for spell in linuxwacom \
- xf86-input-synaptics \
- synaptics \
- xf86-video-i128 \
- xf86-input-acecad \
- xf86-video-i740 \
- xf86-input-aiptek \
- xf86-video-i810 \
- xf86-input-calcomp \
- xf86-video-impact \
- xf86-input-citron \
- xf86-video-imstt \
- xf86-input-digitaledge \
- xf86-video-intel \
- xf86-input-dmc \
- xf86-video-mga \
- xf86-input-dynapro \
- xf86-video-neomagic \
- xf86-input-elo2300 \
- xf86-video-newport \
- xf86-input-elographics \
- xf86-video-nouveau \
- xf86-input-evdev \
- xf86-video-nsc \
- xf86-input-fpit \
- xf86-video-nv \
- xf86-input-hyperpen \
- xf86-video-openchrome \
- xf86-input-jamstudio \
- xf86-video-radeonhd \
- xf86-input-joystick \
- xf86-video-rendition \
- xf86-input-keyboard \
- xf86-video-s3 \
- xf86-input-magellan \
- xf86-video-s3virge \
- xf86-input-magictouch \
- xf86-video-savage \
- xf86-input-microtouch \
- xf86-video-siliconmotion \
- xf86-input-mouse \
- xf86-video-sisusb \
- xf86-input-mutouch \
- xf86-video-sis \
- xf86-input-palmax \
- xf86-video-sunbw2 \
- xf86-input-penmount \
- xf86-video-suncg14 \
- xf86-input-spaceorb \
- xf86-video-suncg3 \
- xf86-input-summa \
- xf86-video-suncg6 \
- xf86-input-tek4957 \
- xf86-video-sunffb \
- xf86-input-ur98 \
- xf86-video-sunleo \
- xf86-input-vmmouse \
- xf86-video-suntcx \
- xf86-input-void \
- xf86-video-tdfx \
- xf86-video-apm \
- xf86-video-tga \
- xf86-video-ark \
- xf86-video-trident \
- xf86-video-ast \
- xf86-video-tseng \
- xf86-video-ati \
- xf86-video-v4l \
- xf86-video-chips \
- xf86-video-vesa \
- xf86-video-cirrus \
- xf86-video-vga \
- xf86-video-cyrix \
- xf86-video-via \
- xf86-video-dummy \
- xf86-video-vmware \
- xf86-video-fbdev \
- xf86-video-voodoo \
- xf86-video-glint \
- xf86-video-wsfb \
- xf86-video-geode \
- xf86-input-diamondtouch \
- mesalib; do
- if spell_ok $spell; then
- up_trigger $spell check_self
- fi
- done
-fi
-
-# this still seems to be a good idea overall
-unset provider spell
-
-local provider
-local spell
-
-if spell_ok $SPELL; then
- for spell in xkbutils \
- xkbcomp \
- xkbprint \
- xkbevd \
- libxkbui \
- libxkbfile \
- xkeyboard-config \
- setxkbmap; do
- if spell_ok $spell; then
- up_trigger $spell check_self
- fi
- done
-fi
+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 &&
+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
+ fi
+done



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6f2e99b6bd1a9cdefb3d5167d082c20d9d78859f), Jaka Kranjc, 08/30/2008

Archive powered by MHonArc 2.6.24.

Top of Page