eclipse-launcher-set-install-dir-and-shared-config.patch

   1 Index: library/eclipse.c
   2 ===================================================================
   3 RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/eclipse.c,v
   4 retrieving revision 1.20
   5 diff -u -r1.20 eclipse.c
   6 --- library/eclipse.c   8 Feb 2007 16:57:15 -0000       1.20
   7 +++ library/eclipse.c   1 Mar 2007 03:44:19 -0000
   8 @@ -330,8 +330,9 @@
   9
  10  /* Define the required VM arguments (all platforms). */
  11  static _TCHAR*  cp = NULL;
  12 -static _TCHAR*  cpValue = NULL;
  13 -static _TCHAR** reqVMarg[] = { &cp, &cpValue, NULL };  /* required VM args */
  14 +static _TCHAR*  cpValue = NULL;
  15 +static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration");
  16 +static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &cp, &cpValue, NULL }; /* required VM args */
  17  static _TCHAR** userVMarg  = NULL;                                     /* user specific args for the Java VM  */
  18  static _TCHAR** eeVMarg = NULL;                                                        /* vm args specified in ee file */
  19  static int nEEargs = 0;
  20 @@ -915,20 +916,12 @@
  21   */
  22  _TCHAR* getProgramDir( )
  23  {
  24 -       _TCHAR*  ch;
  25         _TCHAR*  programDir;
  26 +       _TCHAR* temp = _T_ECLIPSE("/usr/share/eclipse/");
  27
  28 -    programDir = malloc( (_tcslen( program ) + 1) * sizeof(_TCHAR) );
  29 -    _tcscpy( programDir, program );
  30 -    ch = _tcsrchr( programDir, dirSeparator );
  31 -       if (ch != NULL)
  32 -    {
  33 -       *(ch+1) = _T_ECLIPSE('\0');
  34 -               return programDir;
  35 -    }
  36 -
  37 -    free( programDir );
  38 -    return NULL;
  39 +       programDir = malloc( (_tcslen( temp + 1 )) * sizeof(_TCHAR) );
  40 +       _tcscpy( programDir, temp );
  41 +       return programDir;
  42  }
  43
  44  static _TCHAR* findStartupJar(){
  45 Index: library/gtk/make_linux.mak
  46 ===================================================================
  47 RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/gtk/make_linux.mak,v
  48 retrieving revision 1.10
  49 diff -u -r1.10 make_linux.mak
  50 --- library/gtk/make_linux.mak  7 Feb 2007 18:13:48 -0000       1.10
  51 +++ library/gtk/make_linux.mak  1 Mar 2007 03:44:19 -0000
  52 @@ -43,7 +43,7 @@
  53  DLL = $(PROGRAM_LIBRARY)
  54  LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
  55  LFLAGS = -shared -fpic -Wl,--export-dynamic
  56 -CFLAGS = -O -s -Wall\
  57 +CFLAGS = -O -s -Wall -g \
  58         -fpic \
  59         -DLINUX \
  60         -DMOZILLA_FIX \