From 2287efb725fba1b24f98b3e191e1eabc846f02ee Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 19 2019 12:35:23 +0000 Subject: Update to latest upstream release --- diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index eea8f2b..428cf57 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -22,7 +22,7 @@ Epoch: 2 %global eclipse_base %{_datadir}/eclipse -%global cdt_snapshot org.eclipse.cdt-825423c1e3b2c94d628fbfc5de3c179a647ca51b +%global cdt_snapshot org.eclipse.cdt-7741bd98f7b08a281c4b7f60e60c5839f315f760 %global template_snapshot org.eclipse.tools.templates-dc437804a238f57a12675f882ba2fbac7c79ef1a %global _cdtstandalonedir %{_prefix}/lib/cdt-stand-alone-debugger @@ -31,12 +31,6 @@ Epoch: 2 %global __provides_exclude_from ^%{_cdtstandalonedir}/.*$ %global __requires_exclude_from ^%{_cdtstandalonedir}/.*$ -%ifarch %{ix86} - %global eclipse_arch x86 -%endif -%ifarch %{arm} - %global eclipse_arch arm -%endif %ifarch s390x x86_64 aarch64 ppc64le %global eclipse_arch %{_arch} %endif @@ -47,15 +41,15 @@ Epoch: 2 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt -Version: 9.7.0 -Release: 5%{?dist} +Version: 9.8.0 +Release: 1%{?dist} License: EPL-2.0 and CPL -URL: http://www.eclipse.org/cdt +URL: https://www.eclipse.org/cdt -Source0: http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/%{cdt_snapshot}.tar.xz +Source0: https://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/%{cdt_snapshot}.tar.xz # This could be broken out into a separate SRPM if another project starts using it -Source1: http://git.eclipse.org/c/cdt/org.eclipse.tools.templates.git/snapshot/%{template_snapshot}.tar.xz +Source1: https://git.eclipse.org/c/cdt/org.eclipse.tools.templates.git/snapshot/%{template_snapshot}.tar.xz Source3: eclipse-cdt.desktop @@ -71,6 +65,9 @@ Patch2: eclipse-cdt-config-ini.patch # Following fixes Standalone Debugger README file to refer to /usr/bin/cdtdebug Patch3: eclipse-cdt-cdtdebug-readme.patch +# See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=548138 +Patch4: eclipse-ebz548138.patch + # Upstream Eclipse no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -83,7 +80,7 @@ BuildRequires: desktop-file-utils BuildRequires: google-gson BuildRequires: glassfish-jaxb-api BuildRequires: glassfish-jaxb-runtime >= 2.2.11-14 -BuildRequires: eclipse-launchbar >= 1:2.2.2 +BuildRequires: eclipse-launchbar >= 1:2.3.0 BuildRequires: eclipse-license2 BuildRequires: eclipse-platform BuildRequires: eclipse-pde @@ -101,7 +98,7 @@ BuildRequires: eclipse-tm-terminal-connectors >= 4.3.0 Requires: gdb make gcc-c++ Requires: hamcrest -Requires: eclipse-launchbar >= 1:2.2.2 +Requires: eclipse-launchbar >= 1:2.3.0 %if %{_enable_container_and_remote_support} Requires: autoconf automake libtool Requires: eclipse-remote >= 2.1.0 @@ -196,6 +193,7 @@ cp %{SOURCE4} man %patch1 -p0 %patch2 -p0 %patch3 -p1 +%patch4 -p1 # Fix tycho target environment TYCHO_ENV="linuxgtk%{eclipse_arch}" @@ -203,32 +201,27 @@ TYCHO_ENV="linuxgtk%{eclipse_arch}|org.eclipse.cdt.core.linux.%{eclipse_arch}|g" pom.xml -%endif -%ifarch s390x x86_64 aarch64 ppc64le +sed -i -e 's/"org.eclipse.cdt.core.linux.x86_64"/"org.eclipse.cdt.core.linux.%{eclipse_arch}"/g' \ + -e 's/arch="x86_64"/arch="%{eclipse_arch}"/' releng/org.eclipse.cdt.native-feature/feature.xml +sed -i -e "s|org.eclipse.cdt.core.linux.x86_64|org.eclipse.cdt.core.linux.%{eclipse_arch}|g" pom.xml + +# Ensure serial can be built on current arch sed -i -e 's|linux/x86_64/|linux/%{eclipse_arch}/|' \ native/org.eclipse.cdt.native.serial/jni/Makefile -%else -sed -i -e 's|linux/x86/|linux/%{eclipse_arch}/|' \ - native/org.eclipse.cdt.native.serial/jni/Makefile +sed -i -e 's/x86_64/%{eclipse_arch}/' \ + native/org.eclipse.cdt.native.serial/pom.xml %endif -sed -i -e 's|-m.. |$(CFLAGS) $(LDFLAGS) |' \ - native/org.eclipse.cdt.native.serial/jni/Makefile # Ensure correct platform fragments appear in config.ini ... sed -i -e 's/x86_64/%{eclipse_arch}/' \ @@ -415,11 +408,6 @@ export JAVA_HOME=%{_jvmdir}/java export CFLAGS="${CFLAGS:-%__global_cflags}" export LDFLAGS="${LDFLAGS:-%__global_ldflags}" -# Build native serial library -pushd native/org.eclipse.cdt.native.serial/jni -make ../os/linux/%{eclipse_arch}/libserial.so -popd - # Avoid running out of heap on s390x export MAVEN_OPTS="-Xmx1024m" @@ -535,6 +523,9 @@ rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail* %endif %changelog +* Wed Jun 19 2019 Mat Booth - 2:9.8.0-1 +- Update to latest upstream release + * Sun Jun 09 2019 Mat Booth - 2:9.7.0-5 - Enable further bundles during bootstrap diff --git a/eclipse-ebz548138.patch b/eclipse-ebz548138.patch new file mode 100644 index 0000000..68394ef --- /dev/null +++ b/eclipse-ebz548138.patch @@ -0,0 +1,84 @@ +From 0b9b9890ee1bce79eed3a8b4d876e18ddff9be65 Mon Sep 17 00:00:00 2001 +From: Marco Stornelli +Date: Tue, 11 Jun 2019 17:45:20 +0200 +Subject: Bug 548138 - Fix override method with implementation + +Change-Id: Icbea4fe97e8f3b481ea187f905661c8adcc7cc06 +Signed-off-by: Marco Stornelli +--- + .../OverrideMethodsRefactoringTest.java | 32 ++++++++++++++++++++++ + core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 2 +- + .../ui/refactoring/overridemethods/Method.java | 3 -- + 3 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/overridemethods/OverrideMethodsRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/overridemethods/OverrideMethodsRefactoringTest.java +index 7002675e29..9147c8b2a5 100755 +--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/overridemethods/OverrideMethodsRefactoringTest.java ++++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/overridemethods/OverrideMethodsRefactoringTest.java +@@ -640,4 +640,36 @@ public class OverrideMethodsRefactoringTest extends RefactoringTestBase { + selectedMethods = new String[] { "baseFunc(void *)const" }; + assertRefactoringSuccess(); + } ++ ++ //A.h ++ //class Base { ++ //public: ++ // virtual ~Base(); ++ // virtual void baseFunc() const { ++ // } ++ //}; ++ //class X: public Base { ++ //public: ++ // X(); ++ // /*$*//*$$*/ ++ //}; ++ //==================== ++ //class Base { ++ //public: ++ // virtual ~Base(); ++ // virtual void baseFunc() const { ++ // } ++ //}; ++ //class X: public Base { ++ //public: ++ // X(); ++ // virtual void baseFunc() const; ++ //}; ++ // ++ //inline void X::baseFunc() const { ++ //} ++ public void testWithHeaderOnlyImpl_Bug548138() throws Exception { ++ selectedMethods = new String[] { "baseFunc()const" }; ++ assertRefactoringSuccess(); ++ } + } +diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +index 7b3fb4f05b..819d5ad39e 100644 +--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF ++++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %pluginName + Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true +-Bundle-Version: 6.5.0.qualifier ++Bundle-Version: 6.5.100.qualifier + Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin + Bundle-Vendor: %providerName + Bundle-Localization: plugin +diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/overridemethods/Method.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/overridemethods/Method.java +index 7da8987a12..9a92f39f46 100644 +--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/overridemethods/Method.java ++++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/overridemethods/Method.java +@@ -137,9 +137,6 @@ public class Method { + return null; + + IASTDeclarator declarator = (IASTDeclarator) declaration.getParent(); +- IASTNode parent = declarator.getParent(); +- if (!(parent instanceof IASTSimpleDeclaration)) +- return null; + + /** + * We can't just copy the original nodes here but we need to create a new node. We can't do it +-- +cgit v1.2.1 +