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

[glen]

Author: glen                         Date: Sat Dec  1 18:48:52 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from http://cvs.fedoraproject.org/viewcvs/rpms/eclipse/devel/eclipse-launcher-set-install-dir-and-shared-config.patch

---- Files affected:
SOURCES:
   eclipse-launcher-set-install-dir-and-shared-config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/eclipse-launcher-set-install-dir-and-shared-config.patch
diff -u /dev/null SOURCES/eclipse-launcher-set-install-dir-and-shared-config.patch:1.1
--- /dev/null	Sat Dec  1 19:48:52 2007
+++ SOURCES/eclipse-launcher-set-install-dir-and-shared-config.patch	Sat Dec  1 19:48:47 2007
@@ -0,0 +1,60 @@
+Index: library/eclipse.c
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/eclipse.c,v
+retrieving revision 1.20
+diff -u -r1.20 eclipse.c
+--- library/eclipse.c	8 Feb 2007 16:57:15 -0000	1.20
++++ library/eclipse.c	1 Mar 2007 03:44:19 -0000
+@@ -330,8 +330,9 @@
+ 
+ /* Define the required VM arguments (all platforms). */
+ static _TCHAR*  cp = NULL;
+-static _TCHAR*  cpValue = NULL;					
+-static _TCHAR** reqVMarg[] = { &cp, &cpValue, NULL };	/* required VM args */
++static _TCHAR*  cpValue = NULL;
++static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration");					
++static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &cp, &cpValue, NULL };	/* required VM args */
+ static _TCHAR** userVMarg  = NULL;	     				/* user specific args for the Java VM  */
+ static _TCHAR** eeVMarg = NULL;							/* vm args specified in ee file */
+ static int nEEargs = 0;
+@@ -915,20 +916,12 @@
+  */
+ _TCHAR* getProgramDir( )
+ {
+-	_TCHAR*  ch;
+ 	_TCHAR*  programDir;
++	_TCHAR* temp = _T_ECLIPSE("/usr/share/eclipse/");
+ 
+-    programDir = malloc( (_tcslen( program ) + 1) * sizeof(_TCHAR) );
+-    _tcscpy( programDir, program );
+-    ch = _tcsrchr( programDir, dirSeparator );
+-	if (ch != NULL)
+-    {
+-    	*(ch+1) = _T_ECLIPSE('\0');
+-   		return programDir;
+-    }
+-
+-    free( programDir );
+-    return NULL;
++	programDir = malloc( (_tcslen( temp + 1 )) * sizeof(_TCHAR) );
++	_tcscpy( programDir, temp );
++	return programDir;
+ }
+ 
+ static _TCHAR* findStartupJar(){
+Index: library/gtk/make_linux.mak
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/gtk/make_linux.mak,v
+retrieving revision 1.10
+diff -u -r1.10 make_linux.mak
+--- library/gtk/make_linux.mak	7 Feb 2007 18:13:48 -0000	1.10
++++ library/gtk/make_linux.mak	1 Mar 2007 03:44:19 -0000
+@@ -43,7 +43,7 @@
+ DLL = $(PROGRAM_LIBRARY)
+ 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
+ LFLAGS = -shared -fpic -Wl,--export-dynamic 
+-CFLAGS = -O -s -Wall\
++CFLAGS = -O -s -Wall -g \
+ 	-fpic \
+ 	-DLINUX \
+ 	-DMOZILLA_FIX \
================================================================