- Fix problem in launcher-addplatformtotildeeclipse.patch.
- Resolves: #238109.
This commit is contained in:
parent
5f528beb11
commit
af1c56df54
|
@ -6,8 +6,8 @@ RCS file: /cvsroot/eclipse/platform-launcher/library/gtk/eclipseGtk.c,v
|
||||||
retrieving revision 1.27
|
retrieving revision 1.27
|
||||||
diff -u -r1.27 eclipseGtk.c
|
diff -u -r1.27 eclipseGtk.c
|
||||||
--- library/gtk/eclipseGtk.c 27 Mar 2006 18:25:42 -0000 1.27
|
--- library/gtk/eclipseGtk.c 27 Mar 2006 18:25:42 -0000 1.27
|
||||||
+++ library/gtk/eclipseGtk.c 28 Nov 2006 19:50:03 -0000
|
+++ library/gtk/eclipseGtk.c 27 Apr 2007 08:39:06 -0000
|
||||||
@@ -335,3 +335,73 @@
|
@@ -335,3 +335,88 @@
|
||||||
gtk_main_quit();
|
gtk_main_quit();
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -20,22 +20,37 @@ diff -u -r1.27 eclipseGtk.c
|
||||||
+ gsize old_length;
|
+ gsize old_length;
|
||||||
+ gchar *old_contents, *new_contents;
|
+ gchar *old_contents, *new_contents;
|
||||||
+ GError *error = NULL;
|
+ GError *error = NULL;
|
||||||
+ const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.1.r321_v20060801-clWbqCmjexIWDqg\" url=\"features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/\">\n</feature>\n</site>\n\0";
|
+ const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.2.r322_v20070104-iwP0VLKnfFC923K\" url=\"features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/\">\n</feature>\n</site>\n\0";
|
||||||
+
|
+
|
||||||
+ platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
|
+ platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
|
||||||
+ touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL);
|
+ touched = g_strconcat(g_get_home_dir(), "/.eclipse/.dont-need-to-modify-homedir-fedora", NULL);
|
||||||
+
|
+
|
||||||
+ /* If platform.xml doesn't exist, Eclipse has yet to be started
|
+
|
||||||
+ * so don't worry about doing anything. Also, guard against doing
|
+ if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS))
|
||||||
+ * this more than once with a dot file. */
|
+ {
|
||||||
+ if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS) || \
|
+ /* If platform.xml doesn't exist, Eclipse has yet to be started.
|
||||||
+ g_file_test(touched, G_FILE_TEST_EXISTS)) {
|
+ * We don't have worry about doing anything now and in the future
|
||||||
|
+ * so add the appropriate file to ~/.eclipse. */
|
||||||
|
+ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
|
||||||
|
+ {
|
||||||
|
+ g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.");
|
||||||
|
+ g_print(g_strconcat(error->message, "\n\0", NULL));
|
||||||
|
+ g_free(error);
|
||||||
|
+ }
|
||||||
|
+ g_free(platform_xml);
|
||||||
|
+ g_free(touched);
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ } else if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
|
||||||
|
+ /* touched exists, we don't need to do anything */
|
||||||
+ g_free(platform_xml);
|
+ g_free(platform_xml);
|
||||||
+ g_free(touched);
|
+ g_free(touched);
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
|
+ /* At this point platform_xml exists and touched does not exist */
|
||||||
|
+
|
||||||
+ if (g_file_get_contents (platform_xml,
|
+ if (g_file_get_contents (platform_xml,
|
||||||
+ &old_contents, &old_length, &error) == FALSE)
|
+ &old_contents, &old_length, &error) == FALSE)
|
||||||
+ {
|
+ {
|
||||||
|
@ -68,7 +83,7 @@ diff -u -r1.27 eclipseGtk.c
|
||||||
+
|
+
|
||||||
+ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
|
+ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
|
||||||
+ {
|
+ {
|
||||||
+ g_print("Error touching ~/.eclipse/.homedirmodified-fedora.\
|
+ g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.\
|
||||||
+ You should remove ~/.eclipse before restarting Eclipse:\0");
|
+ You should remove ~/.eclipse before restarting Eclipse:\0");
|
||||||
+ g_print(g_strconcat(error->message, "\n\0", NULL));
|
+ g_print(g_strconcat(error->message, "\n\0", NULL));
|
||||||
+ g_free(error);
|
+ g_free(error);
|
||||||
|
@ -87,7 +102,7 @@ RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
|
||||||
retrieving revision 1.71
|
retrieving revision 1.71
|
||||||
diff -u -r1.71 eclipse.c
|
diff -u -r1.71 eclipse.c
|
||||||
--- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71
|
--- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71
|
||||||
+++ library/eclipse.c 28 Nov 2006 19:50:03 -0000
|
+++ library/eclipse.c 27 Apr 2007 08:39:05 -0000
|
||||||
@@ -512,6 +512,8 @@
|
@@ -512,6 +512,8 @@
|
||||||
/* Get the command to start the Java VM. */
|
/* Get the command to start the Java VM. */
|
||||||
vmCommandArgs = getVMCommand( argc, argv );
|
vmCommandArgs = getVMCommand( argc, argv );
|
||||||
|
|
|
@ -19,7 +19,7 @@ Epoch: 1
|
||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
License: Eclipse Public License
|
License: Eclipse Public License
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
|
@ -1718,6 +1718,10 @@ fi
|
||||||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 27 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-10
|
||||||
|
- Fix problem in launcher-addplatformtotildeeclipse.patch.
|
||||||
|
- Resolves: #238109.
|
||||||
|
|
||||||
* Fri Apr 27 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-9
|
* Fri Apr 27 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-9
|
||||||
- Remove BR eclipse-pde.
|
- Remove BR eclipse-pde.
|
||||||
- Related: #236895
|
- Related: #236895
|
||||||
|
|
Loading…
Reference in New Issue