Attachment 945 Details for Bug 7124 – Patch30:dosemu-1.3.2-dosemu_nonX11.patch

[patch] Patch30:dosemu-1.3.2-dosemu_nonX11.patch

dosemu-1.3.2-dosemu_nonX11.patch (text/plain), 3.66 KB, created by Alexey V. Novikov on 2005-06-17 15:32:05 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey V. Novikov

Created: 2005-06-17 15:32:05 MSD

Size: 3.66 KB

patch

obsolete

>diff -uNr dosemu-1.3.2.orig/dist/dosemu dosemu-1.3.2/dist/dosemu
>--- dosemu-1.3.2.orig/dist/dosemu	2005-06-14 13:18:09 +0400
>+++ dosemu-1.3.2/dist/dosemu	2005-06-14 13:23:35 +0400
>@@ -8,7 +8,6 @@
> # the below line gets patched, when a systemwide install is done
> SYSTEM_INSTALL_PATH=NOT_SYSTEM_WIDE
> SYSTEM_CONF_PATH=NOT_SYSTEM_WIDE
>-SYSTEM_XFONTS_PATH=NOT_SYSTEM_WIDE
> SYSTEM_BIN_PATH=NOT_SYSTEM_WIDE
> test "$SYSTEM_INSTALL_PATH" != "NOT_SYSTEM_WIDE" && IS_SYSTEM_WIDE=1
> 
>@@ -261,96 +260,10 @@
>   fi
> fi
> 
>-unset XFLAG
>-if [ "`basename $ARG0`" = "xdosemu" ]; then
>-  if [ -n "$DUMBTERM" ]; then
>-    echo "
>-  You requested a dumb terminal together with X!
>-  ... falling back to non-X
>-"
>-  else
>-    XFLAG=1
>-  fi
>-fi
>-
> if [ -z "$IS_SYSTEM_WIDE" ]; then
>   BOOT_DIR_PATH=`cd $HOME/.dosemu/drives && ls -l c | sed 's/.* -> //'`/..
> fi
> 
>-if [ -n "$XFLAG" ]; then
>-  XFLAG=-X
>-  if [ -z "$DISPLAY" ]; then
>-    echo "
>-  You do not have the DISPLAY variable set, but want to run DOSEMU
>-  in its own X-window. Set the DISPLAY variable such as
>-
>-      DISPLAY=:0.0; export DISPLAY
>-
>-  if running X locally or
>-
>-      DISPLAY=host:0.0; export DISPLAY
>-
>-  when running remotely ('host' being the machine where you are typing at)
>-
>-  After this run xdosemu again.
>-"
>-    exit 1
>-  fi
>-  
>-  if [ -f $HOME/.dosemurc ]; then
>-    FONT=`grep '$_X_font' $HOME/.dosemurc | \
>-         sed -e 's|[#[:space:]]*\$_X_font[[:space:]]*=[[:space:]]*\"$.*$\".*|\1|'`
>-  fi
>-
>-  if [ "$FONT" = "" -a -f $SYSTEM_CONF_PATH/dosemu.conf ]; then
>-     FONT=`grep '$_X_font' $SYSTEM_CONF_PATH/dosemu.conf | \
>-        sed -e 's|[#[:space:]]*\$_X_font[[:space:]]*=[[:space:]]*\"$.*$\".*|\1|'`
>-  fi
>-
>-  if [ "$FONT" = "" ]; then
>-     FONT="vga"
>-  fi
>-
>-  if [ -z "$IS_SYSTEM_WIDE" ]; then
>-     if [ "`xlsfonts -o -fn $FONT 2>/dev/null`" = "" ]; then
>-        if [ ! -f $BOOT_DIR_PATH/Xfonts/fonts.dir ]; then
>-           (cd $BOOT_DIR_PATH/Xfonts; mkfontdir)
>-        fi
>-        if ! xset +fp $BOOT_DIR_PATH/Xfonts 2>/dev/null; then
>-	   # messed up font path -- last resort
>-           xset fp default
>-           xset +fp $BOOT_DIR_PATH/Xfonts 2>/dev/null
>-        fi
>-     fi
>-  else
>-     if [ "`xlsfonts -o -fn $FONT 2>/dev/null`" = "" ]; then
>-        if ! xset +fp $SYSTEM_XFONTS_PATH 2>/dev/null; then
>-	   # messed up font path -- last resort
>-           xset fp default
>-           xset +fp $SYSTEM_XFONTS_PATH 2>/dev/null
>-        fi
>-     fi
>-  fi
>-  if [ "`xlsfonts -o -fn $FONT 2>/dev/null`" = "" ]; then
>-     echo "
>-   You do not have the DOSEMU $FONT font installed and are running
>-   remote X. You need to install the $FONT font on your _local_ Xserver.
>-   Look at the readme for details. For now we start with an fixed font,
>-   which does not display all national characters correctly.
>-   ... be warned
>-"
>-  fi
>-  w4l_check
>-  if [ -z "$QUIET" -a ! -f $HOME/.dosemu/stamp-xdosemu ]; then
>-    echo "
>-   DOSEMU will run in its own X window.
>-   To terminate it you have three choices:
>-   - type <Ctrl>-C _here_ (not in the dosemu window)
>-   - type <Ctrl><Alt><PgDn> in the dosemu window
>-   - execute 'exitemu' at the DOS prompt"
>-    touch ~/.dosemu/stamp-xdosemu
>-  fi
>-else
>   if [ -z "$QUIET" -a ! -f $HOME/.dosemu/stamp-dosemu ]; then
>     echo "
>    DOSEMU will run on _this_ terminal.
>@@ -376,7 +289,6 @@
>     read dummy
>     touch ~/.dosemu/stamp-dosemu
>   fi
>-fi
> 
> DOSDRIVE_D="$HOME"
> export DOSDRIVE_D
>@@ -424,7 +336,7 @@
> 
> eval "set -- $SUFFIX"
> if [ -n "$STRING_I" ] ; then
>-  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF $XFLAG "-I $STRING_I" "$@"
>+  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF "-I $STRING_I" "$@"
> else
>-  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF $XFLAG "$@"
>+  exec $SUDO $BINARY $IGNORE_DOSEMU_CONF "$@"
> fi

Actions: View | Diff

Attachments on bug 7124: 944 | 945