Update to 3.1.2, and hopefully fix build problems on amd64.

8 files changed, 24 insertions, 24 deletions

diff --git a/java/eclipse-cdt/files/patch-cdt-feature.xml b/java/eclipse-cdt/files/patch-cdt-feature.xml
index 5c6eacdaa55c..64e92e9439ce 100644
--- a/java/eclipse-cdt/files/patch-cdt-feature.xml
+++ b/java/eclipse-cdt/files/patch-cdt-feature.xml
@@ -1,5 +1,5 @@
---- eclipse/features/org.eclipse.cdt_3.1.1.200609270800/feature.xml.orig	Wed Sep 27 10:15:13 2006
-+++ eclipse/features/org.eclipse.cdt_3.1.1.200609270800/feature.xml	Mon Nov  6 13:18:34 2006
+--- eclipse/features/org.eclipse.cdt_3.1.2.200702150621/feature.xml.orig	Wed Sep 27 10:15:13 2006
++++ eclipse/features/org.eclipse.cdt_3.1.2.200702150621/feature.xml	Mon Nov  6 13:18:34 2006
 @@ -121,6 +121,14 @@
           fragment="true"/>
  
@@ -8,7 +8,7 @@
 +         os="freebsd"
 +         download-size="0"
 +         install-size="0"
-+         version="3.1.1"
++         version="3.1.2"
 +         fragment="true"/>
 +
 +   <plugin
@@ -22,7 +22,7 @@
 +         arch="x86"
 +         download-size="0"
 +         install-size="0"
-+         version="3.1.1"
++         version="3.1.2"
 +         fragment="true"/>
 +
 +   <plugin
@@ -31,7 +31,7 @@
 +         arch="amd64"
 +         download-size="0"
 +         install-size="0"
-+         version="3.1.1"
++         version="3.1.2"
 +         fragment="true"/>
 +
 +   <plugin
diff --git a/java/eclipse-cdt/files/patch-cdt.core-Makefile b/java/eclipse-cdt/files/patch-cdt.core-Makefile
index 3dbd7439baae..9c7ec1f8f064 100644
--- a/java/eclipse-cdt/files/patch-cdt.core-Makefile
+++ b/java/eclipse-cdt/files/patch-cdt.core-Makefile
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/Makefile.orig	Tue Mar 28 22:42:53 2006
-+++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/Makefile	Tue Mar 28 22:51:40 2006
+--- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.2.200702150621/src/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/library/Makefile.orig	Tue Mar 28 22:42:53 2006
++++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.2.200702150621/src/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/library/Makefile	Tue Mar 28 22:51:40 2006
 @@ -5,17 +5,17 @@
  endif
  
diff --git a/java/eclipse-cdt/files/patch-cdt.core-fragment.xml b/java/eclipse-cdt/files/patch-cdt.core-fragment.xml
index 7b925a65ea1b..65344cc0293f 100644
--- a/java/eclipse-cdt/files/patch-cdt.core-fragment.xml
+++ b/java/eclipse-cdt/files/patch-cdt.core-fragment.xml
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/fragment.xml.orig	Mon Nov  6 13:53:49 2006
-+++ eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/fragment.xml	Mon Nov  6 13:54:04 2006
+--- eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/fragment.xml.orig	Mon Nov  6 13:53:49 2006
++++ eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/fragment.xml	Mon Nov  6 13:54:04 2006
 @@ -5,8 +5,8 @@
      <extension
           point="org.eclipse.cdt.core.ProcessList">
diff --git a/java/eclipse-cdt/files/patch-cdt.core-openpty.c b/java/eclipse-cdt/files/patch-cdt.core-openpty.c
index 829decdfdf52..993bd355dc78 100644
--- a/java/eclipse-cdt/files/patch-cdt.core-openpty.c
+++ b/java/eclipse-cdt/files/patch-cdt.core-openpty.c
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/openpty.c.orig	Thu Mar 30 19:18:06 2006
-+++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/openpty.c	Thu Mar 30 19:18:47 2006
+--- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.2.200702150621/src/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/library/openpty.c.orig	Thu Mar 30 19:18:06 2006
++++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.2.200702150621/src/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/library/openpty.c	Thu Mar 30 19:18:47 2006
 @@ -20,7 +20,6 @@
  #include <grp.h>
  
diff --git a/java/eclipse-cdt/files/patch-cdt.source-feature.xml b/java/eclipse-cdt/files/patch-cdt.source-feature.xml
index 1611e3c1d167..3d9050cfd1ca 100644
--- a/java/eclipse-cdt/files/patch-cdt.source-feature.xml
+++ b/java/eclipse-cdt/files/patch-cdt.source-feature.xml
@@ -1,9 +1,9 @@
---- eclipse/features/org.eclipse.cdt.source_3.1.1.200609270800/feature.xml.orig	Thu Mar 30 19:51:01 2006
-+++ eclipse/features/org.eclipse.cdt.source_3.1.1.200609270800/feature.xml	Thu Mar 30 19:52:13 2006
+--- eclipse/features/org.eclipse.cdt.source_3.1.2.200702150621/feature.xml.orig	Thu Mar 30 19:51:01 2006
++++ eclipse/features/org.eclipse.cdt.source_3.1.2.200702150621/feature.xml	Thu Mar 30 19:52:13 2006
 @@ -22,4 +22,6 @@
- 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.win32.win32.x86" version="3.1.1"/>
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.cdt.source.solaris.motif.sparc" version="3.1.1"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.cdt.source.linux.gtk.x86_64" version="3.1.1"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.x86" version="3.1.1"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.amd64" version="3.1.1"/>
+ 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.win32.win32.x86" version="3.1.2"/>
+ 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.cdt.source.solaris.motif.sparc" version="3.1.2"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.cdt.source.linux.gtk.x86_64" version="3.1.2"/>
++	<plugin ws="gtk"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.x86" version="3.1.2"/>
++	<plugin ws="gtk"  os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.amd64" version="3.1.2"/>
  </feature>
diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties
index 2fafe8c91148..ae19941cad81 100644
--- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties
+++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.properties.orig	Mon Nov  6 14:44:11 2006
-+++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.properties	Mon Nov  6 14:45:02 2006
+--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/plugin.properties.orig	Mon Nov  6 14:44:11 2006
++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/plugin.properties	Mon Nov  6 14:45:02 2006
 @@ -27,6 +27,10 @@
  TargetName.solaris.exe=Executable (Gnu on Solaris)
  TargetName.solaris.so=Shared Library (Gnu on Solaris)
diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml
index 93cdcf15a91c..915c1f71e11c 100644
--- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml
+++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.xml~	Mon Nov  6 14:38:36 2006
-+++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.xml	Mon Nov  6 14:42:23 2006
+--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/plugin.xml~	Mon Nov  6 14:38:36 2006
++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/plugin.xml	Mon Nov  6 14:42:23 2006
 @@ -1317,7 +1317,7 @@
  			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser">
                 <toolChain
diff --git a/java/eclipse-cdt/files/patch-plugin.properties b/java/eclipse-cdt/files/patch-plugin.properties
index 416ddd2cdffa..922fdde43205 100644
--- a/java/eclipse-cdt/files/patch-plugin.properties
+++ b/java/eclipse-cdt/files/patch-plugin.properties
@@ -1,5 +1,5 @@
---- eclipse/plugins/org.eclipse.cdt.core_3.1.1.200609270800/plugin.properties.orig	Thu Mar 30 20:15:52 2006
-+++ eclipse/plugins/org.eclipse.cdt.core_3.1.1.200609270800/plugin.properties	Thu Mar 30 20:16:31 2006
+--- eclipse/plugins/org.eclipse.cdt.core_3.1.2.200702150621/plugin.properties.orig	Thu Mar 30 20:15:52 2006
++++ eclipse/plugins/org.eclipse.cdt.core_3.1.2.200702150621/plugin.properties	Thu Mar 30 20:16:31 2006
 @@ -56,6 +56,7 @@
  fragmentName.solaris = C/C++ Development Tools Core for Solaris
  fragmentName.win32 = C/C++ Development Tools Core for Windows