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 bf17d06265f5b95d45e018e7e407625fc2fde1ee Author: Jakub Adam <[email protected]> Date: Sat Jun 27 16:22:47 2015 +0200 Fix FTBFS with eclipse-cdt 6.0 --- debian/changelog | 1 + debian/patches/fix-build-with-cdt-6.0.patch | 30 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) diff --git a/debian/changelog b/debian/changelog index 08ee28e..2a37a1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ eclipse-ptp (8.1.1-1) UNRELEASED; urgency=medium * New upstream release. + * Fix FTBFS with eclipse-cdt 6.0 (Closes: #789989). -- Jakub Adam <[email protected]> Sat, 27 Jun 2015 14:20:41 +0200 diff --git a/debian/patches/fix-build-with-cdt-6.0.patch b/debian/patches/fix-build-with-cdt-6.0.patch new file mode 100644 index 0000000..782a0b3 --- /dev/null +++ b/debian/patches/fix-build-with-cdt-6.0.patch @@ -0,0 +1,30 @@ +From: Jakub Adam <[email protected]> +Date: Sat, 27 Jun 2015 16:18:23 +0200 +Subject: fix-build-with-cdt-6.0 + +--- + .../org/eclipse/ptp/internal/rdt/core/model/TranslationUnit.java | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/model/TranslationUnit.java b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/model/TranslationUnit.java +index ea9cf3b..e761e61 100644 +--- a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/model/TranslationUnit.java ++++ b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/model/TranslationUnit.java +@@ -45,6 +45,7 @@ import org.eclipse.cdt.internal.core.index.IndexBasedFileContentProvider; + import org.eclipse.cdt.internal.core.model.IBufferFactory; + import org.eclipse.cdt.internal.core.pdom.ASTFilePathResolver; + import org.eclipse.cdt.utils.EFSExtensionManager; ++import org.eclipse.core.resources.IFile; + import org.eclipse.core.runtime.CoreException; + import org.eclipse.core.runtime.IPath; + import org.eclipse.core.runtime.IProgressMonitor; +@@ -634,4 +635,9 @@ public class TranslationUnit extends Parent implements ITranslationUnit { + + return pathString; + } ++ ++ @Override ++ public IFile getFile() { ++ return null; ++ } + } diff --git a/debian/patches/series b/debian/patches/series index 57c7ffb..c730ecd 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-6.0.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-ptp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
