[eclipse-cdt] Added patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=352166

sami wagiaalla swagiaal at fedoraproject.org
Fri Jul 15 18:58:37 UTC 2011


commit 723c6525a3ad11528100d5c58daae890d4fdf7c5
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Fri Jul 15 14:56:45 2011 -0400

    Added patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=352166

 eclipse-cdt-addProblemMarker.patch |   35 +++++++++++++++++++++++++++++++++++
 eclipse-cdt.spec                   |   10 +++++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-cdt-addProblemMarker.patch b/eclipse-cdt-addProblemMarker.patch
new file mode 100644
index 0000000..f5696e5
--- /dev/null
+++ b/eclipse-cdt-addProblemMarker.patch
@@ -0,0 +1,35 @@
+commit 59259fb9bd83766a7892c49a41a6bcb9a562d296
+Author: Sami Wagiaalla <swagiaal at redhat.com>
+Date:   Thu Jul 14 16:47:52 2011 -0400
+
+    Provide public API for adding ProblemMarkerInfo objects
+
+diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
+index aa5fe22..4352efb 100644
+--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
++++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
+@@ -564,12 +564,21 @@ outer:
+ 	 */
+ 	public void generateExternalMarker(IResource file, int lineNumber, String desc, int severity, String varName, IPath externalPath) {
+ 		ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(file, lineNumber, desc, severity, varName, externalPath);
++		this.addProblemMarker(problemMarkerInfo);
++	}
++
++	/**
++	 * Add the given marker to the list of error markers.
++	 * 
++	 * @param problemMarkerInfo - The marker to be added 
++	 */
++	public void addProblemMarker(ProblemMarkerInfo problemMarkerInfo){
+ 		fErrors.add(problemMarkerInfo);
+ 		fMarkerGenerator.addMarker(problemMarkerInfo);
+-		if (severity == IMarkerGenerator.SEVERITY_ERROR_RESOURCE)
+-			hasErrors = true;
++		if (problemMarkerInfo.severity == IMarkerGenerator.SEVERITY_ERROR_RESOURCE)
++			hasErrors = true;		
+ 	}
+-
++	
+ 	/**
+ 	 * Called by the error parsers.
+ 	 * @return the previous line, save in the working buffer.
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 5736db3..3edd40c 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -107,6 +107,9 @@ Patch17: %{name}-ppc64-add_xopen_source-include.patch
 # in the plugin.
 Patch19: %{name}-autotools-local.patch
 
+# Adds new public API to org.eclipse.cdt.core.ErrorParserManager.java
+Patch20: %{name}-addProblemMarker.patch
+
 BuildRequires: eclipse-pde >= 1:3.7.0
 BuildRequires: eclipse-rse >= 3.2
 BuildRequires:  java-devel >= 1.4.2
@@ -163,6 +166,8 @@ pushd "org.eclipse.cdt.releng"
 
 pushd results/plugins
 %patch13
+# CDT patches
+%patch20 -p2
 popd
 
 pushd results/features
@@ -577,6 +582,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Jul 15 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:8.0.0-3
+- Added patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=352166
+
 * Mon Jun 27 2011 Jeff Johnston  <jjohnstn at redhat.com> 1:8.0.0-2
 - Fix RSE requires.
 


More information about the scm-commits mailing list