Magellan Linux

Annotation of /trunk/nxserver-freenx/patches/nxserver-freenx-0.7.3-dpi.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1796 - (hide annotations) (download)
Tue Jun 5 11:54:30 2012 UTC (11 years, 11 months ago) by niro
File size: 1794 byte(s)
-added more patches
1 niro 1796 diff -Naur freenx-server-0.7.3/node.conf.sample freenx-server-0.7.3-magellan/node.conf.sample
2     --- freenx-server-0.7.3/node.conf.sample 2012-06-05 13:58:56.473982660 +0200
3     +++ freenx-server-0.7.3-magellan/node.conf.sample 2012-06-05 14:03:58.776982660 +0200
4     @@ -496,6 +496,12 @@
5     #DEFAULT_X_WM=""
6     #KILL_DEFAULT_X_WM="1"
7    
8     +# Set the default DPI of the X server to the specified value. This
9     +# should normally not be required, but some desktop applications fail
10     +# to set an appropriate value and fall back to 96 DPI, which is the
11     +# value reported by default by the X server.
12     +#DEFAULT_XDPI="96"
13     +
14     # When a 'unix-default' session is requested by the client the user's X startup
15     # script will be run if pressent and executable, otherwise the default X
16     # session will be run.
17     diff -Naur freenx-server-0.7.3/nxloadconfig freenx-server-0.7.3-magellan/nxloadconfig
18     --- freenx-server-0.7.3/nxloadconfig 2012-06-05 13:58:56.474982660 +0200
19     +++ freenx-server-0.7.3-magellan/nxloadconfig 2012-06-05 14:05:31.641982639 +0200
20     @@ -190,6 +190,7 @@
21     USER_FAKE_HOME="" #Calculated
22     SET_LD_LIBRARY_PATH="1"
23    
24     +DEFAULT_XDPI="96"
25     DEFAULT_X_WM=""
26     KILL_DEFAULT_X_WM="1"
27     BOOTSTRAP_X_SESSION="0"
28     diff -Naur freenx-server-0.7.3/nxnode freenx-server-0.7.3-magellan/nxnode
29     --- freenx-server-0.7.3/nxnode 2012-06-05 13:58:56.475982660 +0200
30     +++ freenx-server-0.7.3-magellan/nxnode 2012-06-05 14:04:36.185982655 +0200
31     @@ -333,7 +333,7 @@
32     NODE_WM_PID=$!
33     fi
34    
35     - echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1
36     + echo "Xft.dpi: $DEFAULT_XDPI" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1
37     [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1
38    
39     #