From 3dfa08d48dda7760601a44a89ad7ece99b6d3ec8 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jan 07 2019 16:27:45 +0000 Subject: Update to tagged sources and add patch for QT test runners problem Fix some build issues Avoid unintentional dependency on Java 11 --- diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch index 96975fa..3d7ea26 100644 --- a/eclipse-cdt-config-ini.patch +++ b/eclipse-cdt-config-ini.patch @@ -1,21 +1,28 @@ ---- debug/org.eclipse.cdt.debug.application.product/debug.product.orig 2018-12-13 11:53:16.816008395 +0000 -+++ debug/org.eclipse.cdt.debug.application.product/debug.product 2018-12-13 11:56:58.066193776 +0000 -@@ -177,11 +177,11 @@ +--- debug/org.eclipse.cdt.debug.application.product/debug.product.orig 2018-12-11 12:11:30.000000000 +0000 ++++ debug/org.eclipse.cdt.debug.application.product/debug.product 2019-01-07 13:50:03.610741483 +0000 +@@ -176,16 +176,14 @@ + - +- - -+ - +- - ++ ++ + - + - -@@ -197,7 +197,7 @@ +- +- ++ + + + +@@ -197,7 +195,7 @@ @@ -24,7 +31,7 @@ -@@ -205,10 +205,7 @@ +@@ -205,10 +203,7 @@ @@ -35,7 +42,7 @@ -@@ -240,12 +237,9 @@ +@@ -240,12 +235,9 @@ @@ -48,7 +55,7 @@ -@@ -270,7 +264,6 @@ +@@ -270,7 +262,6 @@ @@ -56,7 +63,7 @@ -@@ -299,9 +292,7 @@ +@@ -299,9 +290,7 @@ @@ -66,7 +73,7 @@ -@@ -320,7 +311,6 @@ +@@ -320,7 +309,6 @@ @@ -74,7 +81,7 @@ -@@ -348,9 +338,7 @@ +@@ -348,9 +336,7 @@ @@ -84,7 +91,7 @@ -@@ -359,7 +347,6 @@ +@@ -359,7 +345,6 @@ @@ -92,7 +99,7 @@ -@@ -374,14 +361,15 @@ +@@ -374,14 +359,15 @@ diff --git a/eclipse-cdt-qt-npe.patch b/eclipse-cdt-qt-npe.patch new file mode 100644 index 0000000..c652aaa --- /dev/null +++ b/eclipse-cdt-qt-npe.patch @@ -0,0 +1,15 @@ +diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java +index 0bd655a..67be200 100644 +--- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java ++++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/model/TestModelManager.java +@@ -416,7 +416,9 @@ public class TestModelManager implements ITestModelUpdater, ITestModelAccessor { + + @Override + public void setTestingTime(int testingTime) { +- currentTestCase.setTestingTime(testingTime); ++ if (currentTestCase != null) { ++ currentTestCase.setTestingTime(testingTime); ++ } + } + + @Override diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 967326c..6495c86 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -16,7 +16,7 @@ Epoch: 2 %global eclipse_base %{_datadir}/eclipse %global cdt_snapshot org.eclipse.cdt-CDT_9_6_0 -%global template_snapshot org.eclipse.tools.templates-0499fb37f4a968dc005768ba9033fc5d6f7c9cd5 +%global template_snapshot org.eclipse.tools.templates-dc437804a238f57a12675f882ba2fbac7c79ef1a %global _cdtstandalonedir %{_prefix}/lib/cdt-stand-alone-debugger @@ -41,7 +41,7 @@ Epoch: 2 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: 9.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: EPL-2.0 and CPL URL: http://www.eclipse.org/cdt @@ -67,6 +67,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 +# Fixes error in QT testrunner +Patch4: eclipse-cdt-qt-npe.patch + BuildRequires: make BuildRequires: rsync BuildRequires: gcc-c++ @@ -215,6 +218,7 @@ cp %{SOURCE4} man %patch1 -p0 %patch2 -p0 %patch3 -p1 +%patch4 -p1 # Fix tycho target environment TYCHO_ENV="linuxgtk%{eclipse_arch}" @@ -253,9 +257,6 @@ sed -i -e 's|-m.. |$(CFLAGS) $(LDFLAGS) |' \ sed -i -e 's/x86_64/%{eclipse_arch}/' \ debug/org.eclipse.cdt.debug.application.product/debug.product -sed -i -e 's/x86/%{eclipse_arch}/g' \ - debug/org.eclipse.cdt.debug.application.product/pom.xml - # remove fragments in standalone product file on platforms they aren't # shipped %ifarch s390x aarch64 ppc64le %{arm} @@ -419,6 +420,11 @@ done %pom_disable_module build/org.eclipse.cdt.meson-feature %pom_disable_module build/org.eclipse.cdt.meson.ui.tests +# Disable lsp4e (missing dep) +%pom_disable_module lsp/org.eclipse.cdt.lsp.core +%pom_disable_module lsp/org.eclipse.cdt.lsp.core.tests +%pom_disable_module lsp/org.eclipse.cdt.lsp-feature + # Disable examples %pom_disable_module visualizer/org.eclipse.cdt.visualizer.examples %pom_disable_module dsf/org.eclipse.cdt.examples.dsf @@ -428,7 +434,11 @@ done %pom_disable_module dsf-gdb/org.eclipse.cdt.examples.dsf.gdb # Fix hamcrest and mockito deps -sed -i -e 's/org.mockito/org.mockito.mockito-core/' -e 's/org.hamcrest/org.hamcrest.library/' \ +RE="-e s/org.hamcrest/org.hamcrest.library/" +%if 0%{?fedora} && 0%{?fedora} < 30 +RE="$RE -e s/org.mockito/org.mockito.mockito-core/" +%endif +sed -i $RE \ dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF \ codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF \ core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF \ @@ -437,7 +447,7 @@ sed -i -e 's/org.mockito/org.mockito.mockito-core/' -e 's/org.hamcrest/org.hamcr # Add template tools to the build tar xf %{SOURCE1} --strip-components=1 --exclude=%{template_snapshot}/pom.xml %pom_set_parent "org.eclipse.cdt:cdt-parent:%{version}-SNAPSHOT" bundles -for b in org.eclipse.tools.templates.{core,freemarker,ui} ; do +for b in org.eclipse.tools.templates.{core,freemarker,ui,freemarker.java11} ; do %pom_xpath_inject "pom:project/pom:modules" "bundles/$b" done @@ -447,6 +457,17 @@ sed -i -e 's/org.freemarker/org.freemarker.freemarker/' \ bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF \ build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF +# Use unversioned dep of packages that can be supplied by the JRE +sed -i -e '/javax.xml.bind/s/;version="2.2.0"//' \ +core/org.eclipse.cdt.core/META-INF/MANIFEST.MF \ +qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF \ +bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF +sed -i -e '/com.sun.xml.bind/d' -e '/org.eclipse.tools.templates.core/s/,//' bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF +sed -i -e 's/javax.xml.bind/jaxb-api/' bundles/org.eclipse.tools.templates.freemarker/build.properties +sed -i -e 's/com.sun.xml.bind.v2/com.sun.xml.internal.bind.v2/' bundles/org.eclipse.tools.templates.freemarker/src/org/eclipse/tools/templates/freemarker/FMGenerator.java +# Avoid unnecessary dep on Java 11 +sed -i -e 's/JavaSE-11/JavaSE-1.8/' bundles/org.eclipse.tools.templates.freemarker.java11/META-INF/MANIFEST.MF + # Don't package problematic test data rm core/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.so rm core/org.eclipse.cdt.core.tests/resources/exebig/x86/o.g/exebig_g @@ -674,6 +695,11 @@ fi %endif %changelog +* Mon Jan 07 2019 Mat Booth - 2:9.6.0-2 +- Update to tagged sources and add patch for QT test runners problem +- Fix some build issues +- Avoid unintentional dependency on Java 11 + * Tue Dec 11 2018 Mat Booth - 2:9.6.0-1 - Update to 2018-12 release - Switch to EPL 2.0 license diff --git a/sources b/sources index a0a1d17..671decc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.eclipse.cdt-82e87633792602ddd907828257faac8dced5969b.tar.xz) = 0f9c9ebf7f25110d7de4c2f32760d6d4cb4932d0eeafa990c912cde0197bd1beb801ee59511852e24af370b4525bcc644c5e4d473be4ef378fcdcc69351d9c0e SHA512 (org.eclipse.tools.templates-dc437804a238f57a12675f882ba2fbac7c79ef1a.tar.xz) = da927bde32239b79c79930a5b8eb242684329ac412f5454feb5f0dbdda6d366533e8a37123a4db831e09af1b559d3607e5777ff27602e921c3e946f70f76d12b +SHA512 (org.eclipse.cdt-CDT_9_6_0.tar.xz) = da232a9c74a5e467499f87e6210ff0756b2ba6c3f7c633a92c2ccc8e716cb33c962d7403c81276fd66aac942351b81fd75ab741217bce697122435130a36bbf3