rpms/eclipse-cdt/F-7 eclipse-cdt-recursive-single-line-rule.patch, NONE, 1.1 eclipse-cdt.spec, 1.75, 1.76
Jeff Johnston (jjohnstn)
fedora-extras-commits at redhat.com
Wed Jun 6 18:15:58 UTC 2007
Author: jjohnstn
Update of /cvs/extras/rpms/eclipse-cdt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv803
Modified Files:
eclipse-cdt.spec
Added Files:
eclipse-cdt-recursive-single-line-rule.patch
Log Message:
* Tue May 01 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-4
- Add patch to fix backwards text entry in new configure files.
- Resovles: #238493
eclipse-cdt-recursive-single-line-rule.patch:
--- NEW FILE eclipse-cdt-recursive-single-line-rule.patch ---
--- ./com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java.fix 2007-05-01 17:53:06.000000000 -0400
+++ ./com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java 2007-05-01 17:53:53.000000000 -0400
@@ -125,10 +125,12 @@ public class RecursiveSingleLineRule ext
}
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
- int column;
+ int column = scanner.getColumn();
+ // Check if we are at EOF, in which case rules don't hold
+ if (column < 0)
+ return Token.UNDEFINED;
if (!resume) {
evalIndex = 0;
- column = scanner.getColumn();
// Check if we are within outer rule boundaries.
if (column >= endIndex || column < startIndex) {
// If not, then we should evaluate to see if the
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-7/eclipse-cdt.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- eclipse-cdt.spec 1 May 2007 21:45:10 -0000 1.75
+++ eclipse-cdt.spec 6 Jun 2007 18:15:22 -0000 1.76
@@ -18,7 +18,7 @@
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: Eclipse Public License / CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -86,6 +86,8 @@
# Patch to ManagedMake builder to prevent running make after Makefile generation
# failure.
Patch11: %{name}-managedbuild-failcheck.patch
+# Patch to fix RecursiveSingleLineRule so it properly recognizes EOF
+Patch12: %{name}-recursive-single-line-rule.patch
BuildRequires: eclipse-pde
%if %{gcj_support}
@@ -153,6 +155,7 @@
mkdir autotools
pushd autotools
tar -xzf %{SOURCE1}
+%patch12 -p0
popd
# Cppunit stuff
@@ -315,6 +318,10 @@
%doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
%changelog
+* Tue May 01 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-4
+- Add patch to fix backwards text entry in new configure files.
+- Resovles: #238493
+
* Mon Apr 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-3
- Add missing gif to org.eclipse.cdt.make.ui.
- Resolves: #236558
More information about the fedora-extras-commits
mailing list