Attachment 380 Details for Bug 764 – Patch for 2004-06-18-trunk

[patch] Patch for 2004-06-18-trunk

patch.gudiff (text/plain), 6.06 KB, created by Roland Mainz on 2004-06-19 01:59:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-06-19 01:59:16 UTC

Size: 6.06 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.63
>diff -u -2 -0 -r1.63 ChangeLog
>--- xc/ChangeLog	17 Jun 2004 13:20:13 -0000	1.63
>+++ xc/ChangeLog	19 Jun 2004 08:48:27 -0000
>@@ -1,20 +1,30 @@
>+2004-06-19 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/programs/Xserver/Xprint/etc/init.d/xprint
>+        Bugzilla #764: Start Xprt with option "-noreset" to get rid
>+        of the problem that Xprt resets itself aftert each client
>+        disconnect when there is only one client and no dtpdmd.
>+        This solves at least the following problems:
>+        - Font paths set after Xprt startup via "xset +fp ..." get lost
>+        - Resources stored in the Xserver get lost
>+        - Displaying a print dialog is awfull slow
>+
> 2004-06-17  Thomas Winischhofer  <thomas@winischhofer.net>
> 
> 	* programs/Xserver/hw/xfree86/drivers/sis/300vtbl.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/310vtbl.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/init.c:
> 	* programs/Xserver/hw/xfree86/drivers/sis/init.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/init301.c:
> 	* programs/Xserver/hw/xfree86/drivers/sis/init301.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/initdef.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/oem300.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/oem310.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/osdef.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis.man:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.c:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.h:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis6326_video.c:
> 	* programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c:
>Index: xc/programs/Xserver/Xprint/etc/init.d/xprint
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/init.d/xprint,v
>retrieving revision 1.8
>diff -u -2 -0 -r1.8 xprint
>--- xc/programs/Xserver/Xprint/etc/init.d/xprint	9 Jun 2004 04:10:31 -0000	1.8
>+++ xc/programs/Xserver/Xprint/etc/init.d/xprint	19 Jun 2004 08:48:36 -0000
>@@ -561,50 +561,50 @@
>     curr=0
>     while [ $curr -lt $num_xpstart ] ; do
>         if [ "${xpstart_remote_server[$curr]}" != "" ] ; then
>             # Remote Xprt, just put the entry into the registry
>             lock_server_registry
>             echo "display=${xpstart_remote_server[$curr]}" >>"${XP_SERVERS}"
>             unlock_server_registry
>         else
>             # Run block in seperate process to avoid that changes to the
>             # xpstart_* variables affect the next cycle
>             (
>               # Use defaults if there are no special options
>               [ "${xpstart_fontpath[$curr]}"               = "" ] &&               xpstart_fontpath[$curr]="${default_fontpath}";
>               [ "${xpstart_fontpath_acceptpattern[$curr]}" = "" ] && xpstart_fontpath_acceptpattern[$curr]="$default_fontpath_acceptpattern";
>               [ "${xpstart_fontpath_rejectpattern[$curr]}" = "" ] && xpstart_fontpath_rejectpattern[$curr]="$default_fontpath_rejectpattern";
>               [ "${xpstart_displayid[$curr]}"              = "" ] &&              xpstart_displayid[$curr]="$(FindFreeXDisplayNum)"       
>               [ "${xpstart_logger[$curr]}"                 = "" ] &&                 xpstart_logger[$curr]="logger -p lpr.notice -t Xprt_${xpstart_displayid[$curr]}";
>               [ "${xpstart_logfile[$curr]}"                = "" ] &&                xpstart_logfile[$curr]="/dev/null";
>               [ "${xpstart_xprt_binary[$curr]}"            = "" ] &&            xpstart_xprt_binary[$curr]="${XPRT_BIN}";
>               if [ "${xpstart_xprt_binary[$curr]}" = "/usr/openwin/bin/Xprt" -o "$(uname -s)" = "SunOS" ] ; then
>-                  # Solaris /usr/openwin/bin/Xprt does not support "-nolisten tcp"
>+                  # Solaris /usr/openwin/bin/Xprt does not support "-nolisten tcp" or "noreset"
>                   # yet nor is it possible to run a Xserver on a unix socket only
>                   # in Solaris since access to the unix domain sockets in
>                   # /tmp/.X11-pipe and /tmp/.X11-unix is restricted to applications
>                   # with group-id "root" (e.g. the Xprt server would need to be
>                   # setgid "root" that plain users can start it listening on a unix
>                   # socket only)
>                   [ "${xpstart_options[$curr]}" = "" ] && xpstart_options[$curr]="-ac -pn"
>               else
>-                  [ "${xpstart_options[$curr]}" = "" ] && xpstart_options[$curr]="-ac -pn -nolisten tcp"
>+                  [ "${xpstart_options[$curr]}" = "" ] && xpstart_options[$curr]="-ac -pn -nolisten tcp -noreset"
>               fi
> 
>               # Check if the Xprt binary is available                                     
>               if [ ! -x "${xpstart_xprt_binary[$curr]}" ] ; then                                            
>                   error_echo "Can't find \"${xpstart_xprt_binary[$curr]}\"."                                  
>                   exit 1 # exit block                                                               
>               fi                                                                          
> 
>               # Verify and set location of font encodings directory file
>               if [ "${xpstart_font_encodings_dir[$curr]}" = "" ] ; then
>                   if [ -f "${XPROJECTROOT}/lib/X11/fonts/xf86encodings/encodings.dir" ] ; then
>                       xpstart_font_encodings_dir[$curr]="${XPROJECTROOT}/lib/X11/fonts/xf86encodings/encodings.dir"
>                   else
>                       xpstart_font_encodings_dir[$curr]="${XPROJECTROOT}/lib/X11/fonts/encodings/encodings.dir";
>                   fi
>               fi
> 
>               unset FONT_ENCODINGS_DIRECTORY
>               if [ ! -f "${xpstart_font_encodings_dir[$curr]}" ] ; then
>                   warning_echo "Can't find \"${xpstart_font_encodings_dir[$curr]}\", TrueType font support may not work."

Actions: View | Splinter Review

Attachments on bug 764: 379 | 380 | 381 | 382 | 385

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.