openoffice-desktop-handle-no-solar-java.patch

   1 --- desktop/scripts/soffice.sh.orig     2003-09-22 12:07:01.000000000 -0700
   2 +++ desktop/scripts/soffice.sh  2003-09-22 12:07:47.000000000 -0700
   3 @@ -144,25 +144,27 @@
   4  esac
   5
   6  # extend the ld_library_path for java: javaldx checks the sofficerc for us
   7 -java_ld_library_path=`"$sd_prog/javaldx"`
   8 -if [ "$java_ld_library_path" != "" ] ; then
   9 -    case $sd_platform in
  10 -        AIX)
  11 -            LIBPATH=${java_ld_library_path}:${LIBPATH}
  12 -            ;;
  13 -        Darwin)
  14 -            DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
  15 -            ;;
  16 -        HP-UX)
  17 -            SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
  18 -            ;;
  19 -        IRIX*)
  20 -            LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
  21 -            ;;
  22 -        *)
  23 -            LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
  24 -            ;;
  25 -    esac
  26 +if [ -x "$sd_prog/javaldx" ] ; then
  27 +    java_ld_library_path=`"$sd_prog/javaldx"`
  28 +    if [ "$java_ld_library_path" != "" ] ; then
  29 +        case $sd_platform in
  30 +            AIX)
  31 +                LIBPATH=${java_ld_library_path}:${LIBPATH}
  32 +                ;;
  33 +            Darwin)
  34 +                DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
  35 +                ;;
  36 +            HP-UX)
  37 +                SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
  38 +                ;;
  39 +            IRIX*)
  40 +                LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
  41 +                ;;
  42 +            *)
  43 +                LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
  44 +                ;;
  45 +        esac
  46 +    fi
  47  fi
  48
  49  # set java environment variables
  50 --- desktop/source/javaldx/makefile.mk.orig     2003-09-22 12:07:12.000000000 -0700
  51 +++ desktop/source/javaldx/makefile.mk  2003-09-22 12:11:42.000000000 -0700
  52 @@ -77,6 +77,8 @@
  53
  54  # --- Files --------------------------------------------------------
  55
  56 +.IF "$(SOLAR_JAVA)"!=""
  57 +
  58  OBJFILES=$(OBJ)$/javaldx.obj
  59
  60  APP1TARGET=javaldx
  61 @@ -86,6 +88,8 @@
  62  APP1STDLIBS+= -lstdc++
  63  .ENDIF
  64
  65 +.ENDIF # "$(SOLAR_JAVA)"!=""
  66 +
  67  # --- Targets ------------------------------------------------------
  68
  69  .INCLUDE :  target.mk