[eclipse-cdt/f19] Fix Indexer preferences page

[Jeff Johnston]

commit 1048d57f6da3aa894f7bfcb86fcfe769e4a6b7e7
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Thu Aug 22 18:04:45 2013 -0400

    Fix Indexer preferences page
    
    - Resolves: #966960

 eclipse-cdt-bug966960.patch |   22 ++++++++++++++++++++++
 eclipse-cdt.spec            |   10 +++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-cdt-bug966960.patch b/eclipse-cdt-bug966960.patch
new file mode 100644
index 0000000..55b77a6
--- /dev/null
+++ b/eclipse-cdt-bug966960.patch
@@ -0,0 +1,22 @@
+commit 59b82422682f40656a39d1bf28d597dd1150c5a6
+Author: Chris Recoskie <recoskie at ca.ibm.com>
+Date:   Thu Aug 22 14:17:38 2013 -0400
+
+    Bug 413080 - IllegalArgumentException in Indexer preference page
+
+diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
+index 5406930..a9de49f 100644
+--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
++++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
+@@ -210,7 +210,10 @@ public class IndexerBlock extends AbstractCOptionPage {
+ 		if (fIndexerConfigMap.size() > 2) {
+ 			fIndexersComboBox = ControlFactory.createSelectCombo(group, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ 			fIndexersComboBox.addSelectionListener(indexerChangeListener);
+-			fReindexOnIndexerChange = ControlFactory.createCheckBox(group, CUIPlugin.getResourceString("IndexerBlock.redindexOnIndexerChange")); //$NON-NLS-1$
++			
++			if(getProject() != null) {
++				fReindexOnIndexerChange = ControlFactory.createCheckBox(group, CUIPlugin.getResourceString("IndexerBlock.redindexOnIndexerChange")); //$NON-NLS-1$
++			}
+ 		}
+ 
+ 		// add composite for pages
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 88b3b98..c340f76 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -24,7 +24,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -60,6 +60,9 @@ Patch5: %{name}-linuxtools-features.patch
 Patch6: %{name}-linuxtools-remove-parent.patch
 Patch7: %{name}-linuxtools-disable-jacoco.patch
 
+# Following fixes bug 966960 regarding C/C++ Indexer Preferences page
+Patch8: %{name}-bug966960.patch
+
 # Following removes a print stack trace from ProcessFactory spawner look-up
 Patch12: %{name}-spawner-issue.patch
 
@@ -119,6 +122,7 @@ Source for Eclipse CDT for use within Eclipse.
 pushd %{cdt_snapshot}
 %patch0 -p1
 %patch4 -p1
+%patch8 -p1
 %patch12 -p1
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Add secondary arch support if we are building there
@@ -327,6 +331,10 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Thu Aug 22 2013 Jeff Johnston <jjohnstn at redhat.com> 1:8.2.0-2
+- Fix Indexer preferences page
+- Resolves: #966960
+
 * Mon Jul 1 2013 Alexander Kurtakov <akurtako at redhat.com> 1:8.2.0-1
 - Update to Kepler final.
 - Don't force qualifiers.