[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force SVN commit: rev 463 - trunk/debian



Author: branden
Date: 2003-08-31 01:17:48 -0500 (Sun, 31 Aug 2003)
New Revision: 463

Modified:
   trunk/debian/changelog
   trunk/debian/shell-lib.sh
Log:
debian/shell-lib.sh: font_update(): ignore requests to run xftcache on the
  Speedo directory; it segfaults under certain circumstances that have
  never been nailed down (Closes: #192138)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-08-31 01:30:11 UTC (rev 462)
+++ trunk/debian/changelog	2003-08-31 06:17:48 UTC (rev 463)
@@ -3,8 +3,12 @@
   * debian/twm.menu-method: correctly escape doublequote characters in menu
     entry titles (thanks, Bill Allombert) (Closes: #193759)
 
- -- Branden Robinson <branden@debian.org>  Sat, 30 Aug 2003 20:28:21 -0500
+  * debian/shell-lib.sh: font_update(): ignore requests to run xftcache on the
+    Speedo directory; it segfaults under certain circumstances that have never
+    been nailed down (Closes: #192138)
 
+ -- Branden Robinson <branden@debian.org>  Sun, 31 Aug 2003 01:13:19 -0500
+
 xfree86 (4.2.1-11) unstable; urgency=medium
 
   * urgency set to medium because bug #206790 bites a lot of people (but,

Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh	2003-08-31 01:30:11 UTC (rev 462)
+++ trunk/debian/shell-lib.sh	2003-08-31 06:17:48 UTC (rev 463)
@@ -213,11 +213,17 @@
       if which $CMD > /dev/null 2>&1; then
         SHORTCMD=$(basename $CMD)
         message_nonl "Running $SHORTCMD in $DIR font directory..."
-        # KLUDGE
+        # KLUDGE: xftcache dies anyway in XFree86 4.3.0
         if [ "$SHORTCMD" = "xftcache" ]; then
           DIR=/usr/X11R6/lib/X11/fonts/$DIR
         fi
-        $CMD $DIR
+        if [ "$SHORTCMD" = "xftcache" -a "$DIR" = "Speedo" ]; then
+          # do nothing; xftcache SEGVs (*sometimes*) when asked to process the
+          # Speedo directory
+          :
+        else
+          $CMD $DIR
+        fi
         message "done."
       else
         message "Note: $CMD not found; not updating $DIR font directory data."



Reply to: