From 7276a459e3e588aa07ecdb7661c0119036c19195 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Feb 29 2016 13:17:52 +0000 Subject: Update to upstream 8.8.1 release. --- diff --git a/eclipse-cdt-exit-code.patch b/eclipse-cdt-exit-code.patch deleted file mode 100644 index a1e7d05..0000000 --- a/eclipse-cdt-exit-code.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ddf192339270ae4bdd8990d4df48689140ac08a1 Mon Sep 17 00:00:00 2001 -From: Marc Khouzam -Date: Thu, 17 Sep 2015 10:39:44 -0400 -Subject: [PATCH] Bug 477728 - Exit code not displayed in console for new Run config - -Change-Id: Id1ecdffb5d3a99908f7ac4ee096f2b7f7e3d6440 ---- - -diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java -index 10605ef..9eff261 100644 ---- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java -+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java -@@ -407,6 +407,13 @@ - if (ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE.equals(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN))) - return true; - } -+ if (mode.equals(ILaunchManager.RUN_MODE)) { -+ // We plan on splitting the Run delegate from the Debug one. -+ // For now, to keep backwards-compatibility, we need to keep the same delegate (to keep its id) -+ // However, we can just call the new delegate class -+ new LocalRunLaunchDelegate().preLaunchCheck(config, mode, monitor); -+ } -+ - return super.preLaunchCheck(config, mode, monitor); - } - diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index edee081..7611375 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -21,9 +21,9 @@ Epoch: 1 %define major 8 %define minor 8 %define majmin %{major}.%{minor} -%define micro 0 +%define micro 1 %define eclipse_base %{_libdir}/eclipse -%define cdt_snapshot org.eclipse.cdt-CDT_8_8_0 +%define cdt_snapshot org.eclipse.cdt-CDT_8_8_1 # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -71,9 +71,6 @@ Patch4: remove-docker.patch # Following removes autotools and remote plugins from repo Patch5: remove-remote.patch -# Following fixes missing exit code in console bug -Patch6: %{pkg_name}-exit-code.patch - BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: eclipse-license @@ -199,7 +196,6 @@ cp %{SOURCE4} man %patch4 -p0 %endif %endif -%patch6 -p1 TYCHO_ENV="linuxgtk%{eclipse_arch}" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" @@ -425,6 +421,9 @@ cp man/cdtdebug.man $manInstallDir/cdtdebug.1 %endif %changelog +* Mon Feb 29 2016 Alexander Kurtakov 1:8.8.1-7 +- Update to upstream 8.8.1 release. + * Tue Feb 09 2016 Roland Grunberg - 1:8.8.0-7 - Update to use proper xmvn provided macros. - Fix CDT GDB Standalone Debugger. diff --git a/sources b/sources index e0fed89..4b1b4c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ da9186b8edfc5f4efaa189ad7c0eb26f eclipse-cdt.desktop -9afb42d7449b4a9e89d41c7f4c99b143 org.eclipse.cdt-CDT_8_8_0.tar.xz +7fbb5ead7e9f8f44e121c65255358692 org.eclipse.cdt-CDT_8_8_1.tar.xz