From da616bcc434c766ffac72eba9a1b058c1b2ab08e Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 15 Jul 2021 16:12:37 -0400 Subject: [PATCH] Bug 574874 - Disable full gdb console support if running CDT in flatpak - add check for flatpak environment variable in GDBBackend_7_12.isFullGdbConsoleSupported() method and return false if variable is set - bump up org.eclipse.cdt.dsf.gdb version Change-Id: I667a63395592e2671ab3bf6f255e7428371086b3 (cherry picked from commit d27126df9a4b87d19674725d0fd7e3c1979ac435) --- dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF | 2 +- .../src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF index 4b353fc32b7..661fcff441a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb;singleton:=true -Bundle-Version: 6.4.0.qualifier +Bundle-Version: 6.4.1.qualifier Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.GdbPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java index 2c2b1286009..d5652d12def 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016 Ericsson and others. + * Copyright (c) 2016, 2021 Ericsson and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -59,7 +59,8 @@ public class GDBBackend_7_12 extends GDBBackend { @Override public boolean isFullGdbConsoleSupported() { - return !Platform.getOS().equals(Platform.OS_WIN32) && !Platform.getOS().equals(Platform.OS_MACOSX) + return System.getenv("FLATPAK_SANDBOX_DIR") == null //$NON-NLS-1$ + && !Platform.getOS().equals(Platform.OS_WIN32) && !Platform.getOS().equals(Platform.OS_MACOSX) && !fPtyFailure; }