From fea478a2e8cec9f2634169532082aec200bba0a0 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Oct 02 2009 19:42:26 +0000 Subject: Another scratch build. --- diff --git a/eclipse-cdt-libhover-oldcdt.patch b/eclipse-cdt-libhover-oldcdt.patch index 8c340c9..e3d7806 100644 --- a/eclipse-cdt-libhover-oldcdt.patch +++ b/eclipse-cdt-libhover-oldcdt.patch @@ -1,14 +1,14 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF ---- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix 2009-10-02 14:32:05.000000000 -0400 -+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF 2009-10-02 14:33:28.000000000 -0400 +--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix 2009-10-02 15:31:47.000000000 -0400 ++++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF 2009-10-02 15:32:51.000000000 -0400 @@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jface.text;bundle-version="3.4.1" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.linuxtools.cdt.libhover +Bundle-ActivationPolicy: lazy diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java ---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix 2009-10-02 14:32:28.000000000 -0400 -+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java 2009-10-02 14:33:28.000000000 -0400 +--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix 2009-10-02 15:32:06.000000000 -0400 ++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java 2009-10-02 15:32:51.000000000 -0400 @@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst * The constructor */ @@ -18,8 +18,8 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/li /* diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java ---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix 2009-10-02 14:32:44.000000000 -0400 -+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java 2009-10-02 14:41:53.000000000 -0400 +--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix 2009-10-02 15:32:21.000000000 -0400 ++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java 2009-10-02 15:39:10.000000000 -0400 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006, 2007, 2008 Red Hat, Inc. @@ -27,7 +27,16 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/intern * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at -@@ -213,44 +213,44 @@ public class LibHover implements ICHelpP +@@ -49,8 +49,6 @@ import org.eclipse.cdt.ui.ICHelpResource + import org.eclipse.cdt.ui.IFunctionSummary; + import org.eclipse.cdt.ui.IRequiredInclude; + import org.eclipse.cdt.ui.text.ICHelpInvocationContext; +-import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext; +-import org.eclipse.cdt.ui.text.SharedASTJob; + import org.eclipse.core.runtime.IConfigurationElement; + import org.eclipse.core.runtime.IExtensionRegistry; + import org.eclipse.core.runtime.IStatus; +@@ -213,44 +211,44 @@ public class LibHover implements ICHelpP return Character.isLetterOrDigit(ch) || ch == '_' || ch == ':'; } @@ -110,12 +119,9 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/intern public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) { IFunctionSummary f; -@@ -264,146 +264,146 @@ public class LibHover implements ICHelpP - ITranslationUnit t = context.getTranslationUnit(); - +@@ -266,155 +264,155 @@ public class LibHover implements ICHelpP String className = null; -- ICPPFunctionType methodType = null; -+// ICPPFunctionType methodType = null; + ICPPFunctionType methodType = null; - if (t.isCXXLanguage()) { - try { @@ -396,7 +402,23 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/intern // Loop through all the documents we have and report first match. for (int i = 0; i < helpBooks.length; ++i) { -@@ -451,7 +451,7 @@ public class LibHover implements ICHelpP + LibHoverLibrary l = libraries.get(helpBooks[i]); + if (name != null) { +- if (className != null) { +- if (l.isCPP()) +- f = getMemberSummary(l, className, name, methodType); +- } else { ++// if (className != null) { ++// if (l.isCPP()) ++// f = getMemberSummary(l, className, name, methodType); ++// } else { + f = getFunctionSummary(l, name); +- } ++// } + if (f != null) + return f; + } +@@ -451,7 +449,7 @@ public class LibHover implements ICHelpP return null; if (methodType != null) { try { @@ -405,7 +427,7 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/intern returnType = methodType.getReturnType(); } catch (DOMException e) { // TODO Auto-generated catch block -@@ -465,11 +465,11 @@ public class LibHover implements ICHelpP +@@ -465,11 +463,11 @@ public class LibHover implements ICHelpP MemberInfo member = info.getMember(memberName); if (member != null) { MemberInfo m = null; @@ -419,7 +441,7 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/intern m = k; break; } -@@ -513,12 +513,18 @@ public class LibHover implements ICHelpP +@@ -513,12 +511,18 @@ public class LibHover implements ICHelpP } @@ -440,7 +462,7 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/intern String[] templateParms = info.getTemplateParms(); String[] result = new String[parameterTypes.length]; for (int i = 0; i < parameterTypes.length; ++i) { -@@ -529,7 +535,11 @@ public class LibHover implements ICHelpP +@@ -529,7 +533,11 @@ public class LibHover implements ICHelpP while (index >= 0) { // We assume no class has more than 9 template parms. int digit = param.charAt(index + 1) - '0'; @@ -454,8 +476,8 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/intern } result[i] = param; diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java ---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix 2009-10-02 14:32:52.000000000 -0400 -+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java 2009-10-02 14:33:28.000000000 -0400 +--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix 2009-10-02 15:32:31.000000000 -0400 ++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java 2009-10-02 15:32:51.000000000 -0400 @@ -21,10 +21,12 @@ import java.net.URL; import java.util.ArrayList; diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 08aa395..6850a08 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -20,7 +20,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 5.1%{?dist} +Release: 5.2%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt