[eclipse-ptp] 05/05: Add d/patches/fix-build-with-cdt-8.3.0.patch

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-ptp.

commit a706daffe1349c91cc52af32f45373bc5ed8898f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Jun 2 22:23:34 2014 +0200

    Add d/patches/fix-build-with-cdt-8.3.0.patch
---
 debian/changelog                              |  1 +
 debian/patches/fix-build-with-cdt-8.3.0.patch | 53 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 55 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fcf36a2..936dee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse-ptp (7.0.4-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Removed d/patches/fix-build-with-cdt-8.2.1.patch
     - fixed upstream.
+  * Add d/patches/fix-build-with-cdt-8.3.0.patch (Closes: #749872).
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 02 Jun 2014 22:16:11 +0200
 
diff --git a/debian/patches/fix-build-with-cdt-8.3.0.patch b/debian/patches/fix-build-with-cdt-8.3.0.patch
new file mode 100644
index 0000000..37eb654
--- /dev/null
+++ b/debian/patches/fix-build-with-cdt-8.3.0.patch
@@ -0,0 +1,53 @@
+From 9bbab099bb395da3dba615c94f76ffeecbb0c420 Mon Sep 17 00:00:00 2001
+From: Greg Watson
+Date: Wed, 5 Mar 2014 18:00:59 -0500
+Subject: Remove reference to DialogsMessages which was changed to package
+ visibility in CDT 8.3.
+
+Change-Id: Ic41917dcbf8190a6c385e00c15933b0bed2faac4
+Signed-off-by: Greg Watson <g.watson at computer.org>
+
+diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/preferences/IndexerBlock.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/preferences/IndexerBlock.java
+index af7c4a3..571dc4e 100644
+--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/preferences/IndexerBlock.java
++++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/preferences/IndexerBlock.java
+@@ -30,7 +30,6 @@ import org.eclipse.cdt.internal.ui.preferences.IndexerPreferencePage;
+ import org.eclipse.cdt.ui.CUIPlugin;
+ import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage;
+ import org.eclipse.cdt.ui.dialogs.AbstractIndexerPage;
+-import org.eclipse.cdt.ui.dialogs.DialogsMessages;
+ import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
+ import org.eclipse.cdt.ui.dialogs.ICOptionContainerExtension;
+ import org.eclipse.cdt.ui.dialogs.NullIndexerBlock;
+@@ -231,11 +230,11 @@ public class IndexerBlock extends AbstractCOptionPage {
+         fIndexerPageComposite.setLayout(new TabFolderLayout());
+ 
+         if (needBuildConfigOptions()) {
+-        	fBuildConfigGroup= group= ControlFactory.createGroup(composite, DialogsMessages.IndexerStrategyBlock_buildConfigGroup, 1);
++        	fBuildConfigGroup= group= ControlFactory.createGroup(composite, Messages.getString("IndexerBlock.0"), 1); //$NON-NLS-1$
+         	gd= (GridData) group.getLayoutData();
+         	gd.grabExcessHorizontalSpace= true;
+-        	fUseActiveBuildButton= ControlFactory.createRadioButton(group, DialogsMessages.IndexerStrategyBlock_activeBuildConfig, null, null);
+-        	fUseFixedBuildConfig= ControlFactory.createRadioButton(group, DialogsMessages.IndexerBlock_fixedBuildConfig, null, null);
++        	fUseActiveBuildButton= ControlFactory.createRadioButton(group, Messages.getString("IndexerBlock.1"), null, null); //$NON-NLS-1$
++        	fUseFixedBuildConfig= ControlFactory.createRadioButton(group, Messages.getString("IndexerBlock.2"), null, null); //$NON-NLS-1$
+         	if(RemoteNature.hasRemoteNature(getProject())){
+         		fIndexAfterBuildOptionCheckbox = ControlFactory.createCheckBox(group, Messages.getString("RemoteRebuildIndexOption.runIndexAfterBuild")); //$NON-NLS-1$
+         		IndexBuildSequenceController indexBuildSequenceController = IndexBuildSequenceController.getIndexBuildSequenceController(getProject());
+diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/messages/messages.properties b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/messages/messages.properties
+index 82a0162..d0ab65a 100755
+--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/messages/messages.properties
++++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/messages/messages.properties
+@@ -83,4 +83,7 @@ RemoteProjectContentsLocationArea.5=Project Location ({0})
+ 
+ RemoteRebuildIndexOption.runIndexAfterBuild=Rebuild index after project is built
+ RemoteRebuildIndexOption.question=Continue Indexing?
+-RemoteRebuildIndexOption.message=Index results may be incorrect since the project has not been built. \n\nDo you want to continue indexing?
+\ No newline at end of file
++RemoteRebuildIndexOption.message=Index results may be incorrect since the project has not been built. \n\nDo you want to continue indexing?
++IndexerBlock.0=Indexing strategy
++IndexerBlock.1=Use active build configuration
++IndexerBlock.2=Use a fixed build configuration
+\ No newline at end of file
+--
+cgit v0.9.2-21-gd62e
diff --git a/debian/patches/series b/debian/patches/series
index 57c7ffb..ddf8b07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-cdt-xlc-dependency.patch
 disable-rdt-ui.patch
 remove-cdt-upc-dependency.patch
 disable-unneeded-core-bundles.patch
+fix-build-with-cdt-8.3.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-ptp.git