diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-17 23:19:48 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-17 23:19:55 -0600 |
| commit | 3798b63c5f2b0baea3b24be48ede03bfbef7d81b (patch) | |
| tree | dd137f0638f6ccbf53af170253a6c0aafd6d014b /package/xinit/patches/patch-startx_cpp | |
| parent | 268ddf223cd7303ddfd8b8ef07c2ce7406e3bc39 (diff) | |
add first preview of a firefox appliance. java plugin and kiosk addon missing.
Diffstat (limited to 'package/xinit/patches/patch-startx_cpp')
| -rw-r--r-- | package/xinit/patches/patch-startx_cpp | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp index 2b3ee6aea..e80ee0ea8 100644 --- a/package/xinit/patches/patch-startx_cpp +++ b/package/xinit/patches/patch-startx_cpp @@ -1,6 +1,32 @@ ---- xinit-1.2.1.orig/startx.cpp 2010-03-15 23:35:56.000000000 +0100 -+++ xinit-1.2.1/startx.cpp 2010-12-13 17:44:35.000000000 +0100 -@@ -242,18 +242,7 @@ if [ x"$enable_xauth" = x1 ] ; then +--- xinit-1.2.1.orig/startx.cpp 2010-03-15 17:35:56.000000000 -0500 ++++ xinit-1.2.1/startx.cpp 2015-02-14 12:26:05.423804908 -0600 +@@ -51,24 +51,8 @@ XCOMM so export the new PATH just in cas + export PATH + #endif + +-#if defined(__SCO__) || defined(__UNIXWARE__) +-XCOMM Set up the XMERGE env var so that dos merge is happy under X +- +-if [ -f /usr/lib/merge/xmergeset.sh ]; then +- . /usr/lib/merge/xmergeset.sh +-elif [ -f /usr/lib/merge/console.disp ]; then +- XMERGE=`cat /usr/lib/merge/console.disp` +- export XMERGE +-fi +- +-userclientrc=$HOME/.startxrc +-sysclientrc=LIBDIR/sys.startxrc +-scouserclientrc=$HOME/.xinitrc +-scosysclientrc=XINITDIR/xinitrc +-#else + userclientrc=$HOME/.xinitrc +-sysclientrc=XINITDIR/xinitrc +-#endif ++sysclientrc=/etc/xinitrc + + userserverrc=$HOME/.xserverrc + sysserverrc=XINITDIR/xserverrc +@@ -242,18 +226,7 @@ if [ x"$enable_xauth" = x1 ] ; then removelist= XCOMM set up default Xauth info for this machine |