/[packages]/cauldron/libreoffice/pristine/SOURCES/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
ViewVC logotype

Diff of /cauldron/libreoffice/pristine/SOURCES/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 89865 by dmorgan, Sat Apr 23 00:42:43 2011 UTC revision 121403 by dmorgan, Sat Jul 9 21:35:22 2011 UTC
# Line 1  Line 1 
1  --- openoffice.org.orig/desktop/scripts/unopkg.sh       2008-01-14 15:55:26.000000000 +0000  --- openoffice.org.orig/desktop/scripts/unopkg.sh       2008-01-14 15:55:26.000000000 +0000
2  +++ openoffice.org/desktop/scripts/unopkg.sh    2008-02-14 10:52:10.000000000 +0000  +++ openoffice.org/desktop/scripts/unopkg.sh    2008-02-14 10:52:10.000000000 +0000
3  @@ -57,6 +57,33 @@  @@ -62,6 +62,33 @@
4       ;;       ;;
5   esac   esac
6    
7  +isshared=0  +isnotuser=0
8  +for arg in $@  +for arg in $@
9  +do  +do
10  +if [ "$arg" = "--shared" ]; then  +if [ "$arg" = "--shared" -o "$arg" = "--bundled" ]; then
11  +    isshared=1  +    isnotuser=1
12  +fi  +fi
13  +done  +done
14  +if [ $isshared -eq 1 ]; then  +if [ $isnotuser -eq 1 ]; then
15  +    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY  +    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
16  +    if [ $? -ne 0 ]; then  +    if [ $? -ne 0 ]; then
17  +        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'  +        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
# Line 33  Line 33 
33  +  +
34   #collect all bootstrap variables specified on the command line   #collect all bootstrap variables specified on the command line
35   #so that they can be passed as arguments to javaldx later on   #so that they can be passed as arguments to javaldx later on
36   for arg in $@   #Recognize the "sync" option. sync must be applied without any other
37  @@ -94,6 +121,8 @@  @@ -110,6 +137,8 @@
38   # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS   # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
39    
40   # execute binary   # execute binary
41  -exec "$sd_prog/unopkg.bin" "$@" \  -exec "$sd_prog/unopkg.bin" "$@"  "$JVMFWKPARAMS" \
42  +"$sd_prog/unopkg.bin" "$@" \  +"$sd_prog/unopkg.bin" "$@"  "$JVMFWKPARAMS" \
43       "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"       "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
44  -  -
45  +if [ -n "$INSTDIR" ]; then  +if [ -n "$INSTDIR" ]; then
Legend:
Removed from v.89865  
changed lines
  Added in v.121403
  ViewVC Help
Powered by ViewVC 1.1.30