From 34d838a2372fb639c2bd528efc01c9a798eb832d Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 22 2018 23:41:50 +0000
Subject: Update to latest snapshot


---

diff --git a/.gitignore b/.gitignore
index ab5a091..9de2b71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,10 +16,5 @@ ammacros-1.9.6.xml
 /org.eclipse.tools.templates-6f34dc60b008d8cdcd7848c76b13b0f2ef8c6134.tar.xz
 /org.eclipse.tools.templates-b6038873b1cd4d7f0a86a98deb2b6e3360e75f14.tar.xz
 /org.eclipse.tools.templates-0435f275891b23060faa5cc33664c6a2fefbf2ac.tar.xz
-/org.eclipse.cdt-fea65eeb1590dd593fcc7e66d5e5ba9d59df26df.tar.gz
 /org.eclipse.tools.templates-b7cecf0b4a70eb74346d3de33096d16b2bbcd880.tar.xz
-/org.eclipse.cdt-cdt_9_4.tar.gz
-/CDT_9_4_2.tar.gz
-/CDT_9_4_3.tar.gz
-/025742ca9153703cbbe803bfa667706c6b7d3543.tar.gz
 /org.eclipse.tools.templates-c7881b5a9894ee1fdb2fa9bc5dd37359533627b5.tar.xz
diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch
index a75d61b..25de08d 100644
--- a/eclipse-cdt-config-ini.patch
+++ b/eclipse-cdt-config-ini.patch
@@ -1,9 +1,10 @@
---- debug/org.eclipse.cdt.debug.application.product/debug.product.orig	2018-01-10 16:53:29.000000000 +0000
-+++ debug/org.eclipse.cdt.debug.application.product/debug.product	2018-01-12 12:35:04.679673154 +0000
-@@ -176,10 +176,10 @@
+--- debug/org.eclipse.cdt.debug.application.product/debug.product.orig	2018-08-22 23:22:23.000000000 +0100
++++ debug/org.eclipse.cdt.debug.application.product/debug.product	2018-08-22 23:45:33.295291827 +0100
+@@ -176,15 +176,12 @@
     <plugins>
        <plugin id="com.google.gson"/>
        <plugin id="com.ibm.icu"/>
+-      <plugin id="javax.activation"/>
 -      <plugin id="javax.annotation"/>
 -      <plugin id="javax.el"/>
 +      <plugin id="com.sun.el.javax.el"/>
@@ -13,8 +14,12 @@
 +      <plugin id="javax.servlet-api"/>
        <plugin id="javax.servlet.jsp"/>
        <plugin id="javax.xml"/>
+-      <plugin id="javax.xml.bind"/>
+-      <plugin id="javax.xml.stream"/>
        <plugin id="org.apache.batik.constants"/>
-@@ -191,20 +191,15 @@
+       <plugin id="org.apache.batik.css"/>
+       <plugin id="org.apache.batik.i18n"/>
+@@ -196,20 +193,15 @@
        <plugin id="org.apache.felix.scr"/>
        <plugin id="org.apache.httpcomponents.httpclient"/>
        <plugin id="org.apache.httpcomponents.httpcore"/>
@@ -36,7 +41,7 @@
        <plugin id="org.eclipse.cdt.debug.application"/>
        <plugin id="org.eclipse.cdt.debug.application.doc"/>
        <plugin id="org.eclipse.cdt.debug.core"/>
-@@ -235,17 +230,10 @@
+@@ -240,17 +232,10 @@
        <plugin id="org.eclipse.core.expressions"/>
        <plugin id="org.eclipse.core.filebuffers"/>
        <plugin id="org.eclipse.core.filesystem"/>
@@ -54,7 +59,7 @@
        <plugin id="org.eclipse.core.resources"/>
        <plugin id="org.eclipse.core.runtime"/>
        <plugin id="org.eclipse.core.variables"/>
-@@ -270,7 +258,6 @@
+@@ -275,7 +260,6 @@
        <plugin id="org.eclipse.e4.ui.workbench"/>
        <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
        <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
@@ -62,7 +67,7 @@
        <plugin id="org.eclipse.e4.ui.workbench.swt"/>
        <plugin id="org.eclipse.e4.ui.workbench3"/>
        <plugin id="org.eclipse.ecf"/>
-@@ -298,11 +285,7 @@
+@@ -304,11 +288,7 @@
        <plugin id="org.eclipse.equinox.jsp.jasper"/>
        <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
        <plugin id="org.eclipse.equinox.launcher"/>
@@ -74,7 +79,7 @@
        <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
        <plugin id="org.eclipse.equinox.p2.core"/>
        <plugin id="org.eclipse.equinox.p2.director"/>
-@@ -321,7 +304,6 @@
+@@ -327,7 +307,6 @@
        <plugin id="org.eclipse.equinox.preferences"/>
        <plugin id="org.eclipse.equinox.registry"/>
        <plugin id="org.eclipse.equinox.security"/>
@@ -82,7 +87,7 @@
        <plugin id="org.eclipse.equinox.security.ui"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator"/>
        <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-@@ -349,11 +331,7 @@
+@@ -355,11 +334,7 @@
        <plugin id="org.eclipse.osgi.util"/>
        <plugin id="org.eclipse.search"/>
        <plugin id="org.eclipse.swt"/>
@@ -94,7 +99,7 @@
        <plugin id="org.eclipse.team.core"/>
        <plugin id="org.eclipse.team.ui"/>
        <plugin id="org.eclipse.text"/>
-@@ -362,7 +340,6 @@
+@@ -368,7 +343,6 @@
        <plugin id="org.eclipse.tools.templates.freemarker"/>
        <plugin id="org.eclipse.tools.templates.ui"/>
        <plugin id="org.eclipse.ui"/>
@@ -102,7 +107,7 @@
        <plugin id="org.eclipse.ui.console"/>
        <plugin id="org.eclipse.ui.editors"/>
        <plugin id="org.eclipse.ui.forms"/>
-@@ -377,14 +354,15 @@
+@@ -383,14 +357,15 @@
        <plugin id="org.eclipse.ui.workbench"/>
        <plugin id="org.eclipse.ui.workbench.texteditor"/>
        <plugin id="org.eclipse.update.configurator"/>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 8196bd9..cc97a78 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -13,7 +13,7 @@
 Epoch: 1
 
 %global eclipse_base            %{_datadir}/eclipse
-%global cdt_snapshot            org.eclipse.cdt-CDT_9_5_2
+%global cdt_snapshot            org.eclipse.cdt-19cbbb52d1620b91918fd8855abcdf5d5243fc01
 %global template_snapshot       org.eclipse.tools.templates-c7881b5a9894ee1fdb2fa9bc5dd37359533627b5
 
 %ifarch %{ix86}
@@ -35,8 +35,8 @@ Epoch: 1
 
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
-Version:        9.5.2
-Release:        1%{?dist}
+Version:        9.6.0
+Release:        0.1%{?dist}
 License:        EPL-1.0 and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -208,6 +208,11 @@ cp %{SOURCE4} man
 %patch2 -p0
 %patch3 -p1
 
+# 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
+
 # Fix tycho target environment
 TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></environment>"
 %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV"
@@ -330,6 +335,12 @@ 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 lsp4e-cpp/org.eclipse.lsp4e.cpp
+%pom_disable_module lsp4e-cpp/org.eclipse.lsp4e.cpp.language
+%pom_disable_module lsp4e-cpp/org.eclipse.lsp4e.cpp.site
+%pom_disable_module lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests
+
 # Disable examples
 %pom_disable_module visualizer/org.eclipse.cdt.visualizer.examples
 %pom_disable_module dsf/org.eclipse.cdt.examples.dsf
@@ -342,7 +353,8 @@ done
 sed -i -e 's/org.mockito/org.mockito.mockito-core/' -e 's/org.hamcrest/org.hamcrest.library/' \
   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
+  core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF \
+  core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
 
 # Add template tools to the build
 tar xf %{SOURCE1} --strip-components=1 --exclude=%{template_snapshot}/pom.xml
@@ -568,6 +580,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 22 2018 Mat Booth <mat.booth@redhat.com> - 1:9.6.0-0.1
+- Update to latest snapshot
+
 * Tue Jul 31 2018 Mat Booth <mat.booth@redhat.com> - 1:9.5.2-1
 - Update to latest upstream release
 
diff --git a/sources b/sources
index ad6e742..00e6704 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (org.eclipse.cdt-CDT_9_5_2.tar.xz) = 8ef0284b9a25ca1709d54df3e92464d44ae5c622231abe6c01c8b7b1d465ae92f0abd4a3b35bb56351b232f27c9bfe4b29e26b0390896f97f8e500b67c5ead2e
+SHA512 (org.eclipse.cdt-19cbbb52d1620b91918fd8855abcdf5d5243fc01.tar.xz) = 2046fe671cfa5713940c06c7655f5d4d8dfe12b840adfc5393dd4a36df0c48cf26a2745eb70ac18a90631b0866115f173d3b78564469b1a7f072c75c08adda89
 SHA512 (org.eclipse.tools.templates-c7881b5a9894ee1fdb2fa9bc5dd37359533627b5.tar.xz) = 68b8829ef2931e652fa73617cc02b5f7581c44010cbed0bdbfa8024ab8a6d85436c8a057082915126b4b4e44423ef40ad51008f702a28d0f61f99ac93509cfa6