From 31d8cec30c9b93c383e7acb1ea3e9e1af16b3a23 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 15 Sep 2016 10:12:32 +0100 Subject: [PATCH] Update to Neon.1 release. - Set qualifiers at source-modification-time instead of build-time, to eliminate descrepancies between architectures, rhbz#1374938 - Set bootstrap flag for new primary architecture. --- eclipse-webkit2-by-default.patch | 29 -------------------- eclipse.spec | 47 ++++++++++++++++++++------------ get-eclipse.sh | 4 +-- sources | 2 +- 4 files changed, 33 insertions(+), 49 deletions(-) diff --git a/eclipse-webkit2-by-default.patch b/eclipse-webkit2-by-default.patch index 96ad1b2..1c297ee 100644 --- a/eclipse-webkit2-by-default.patch +++ b/eclipse-webkit2-by-default.patch @@ -1,32 +1,3 @@ ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java.orig" 2016-04-29 11:07:16.540479847 +0100 -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java" 2016-04-29 11:10:18.983883107 +0100 -@@ -110,7 +110,9 @@ - - if (LibraryLoaded) { - String webkit2 = System.getenv("SWT_WEBKIT2"); // $NON-NLS-1$ -- WEBKIT2 = webkit2 != null && webkit2.equals("1") && OS.GTK3; // $NON-NLS-1$ -+ if (OS.GTK3) { -+ WEBKIT2 = webkit2 == null || webkit2.equals("1"); // $NON-NLS-1$ -+ } - - WebViewType = WebKitGTK.webkit_web_view_get_type (); - ---- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h.orig" 2016-04-29 11:05:57.597603451 +0100 -+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h" 2016-04-29 11:07:04.101656890 +0100 -@@ -29,10 +29,10 @@ - char *gtk3 = getenv("SWT_GTK3"); \ - if (gtk3 == NULL || strcmp(gtk3, "1") == 0) { \ - char *webkit2 = getenv("SWT_WEBKIT2"); \ -- if (webkit2 != NULL && strcmp(webkit2, "1") == 0) { \ -- handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \ -- } else { \ -+ if (webkit2 != NULL && strcmp(webkit2, "0") == 0) { \ - handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk >= 3.x lib */ \ -+ } else { \ -+ handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \ - } \ - } else { \ - handle = dlopen("libwebkit-1.0.so.2", LOAD_FLAGS); /* webkitgtk 1.2.x lib */ \ --- "./eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java.orig" 2016-04-29 12:15:18.524027606 +0100 +++ "./eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java" 2016-04-29 12:20:19.696980780 +0100 @@ -16,9 +16,6 @@ diff --git a/eclipse.spec b/eclipse.spec index df9824a..6206f58 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,13 +1,12 @@ # Set to 1 to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%global bootstrap 0 +%global bootstrap 1 Epoch: 1 %global eb_commit 4e8087f81be00857cd9cdce549392db2a985155a -%global eclipse_tag S4_6_0_RC4a -%global eclipse_version 4.6.0 +%global eclipse_tag S4_6_1_RC4 %if 0%{?fedora} >= 25 %global _jetty_version 9.4.0 @@ -48,8 +47,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: %{eclipse_version} -Release: 7%{?dist} +Version: 4.6.1 +Release: 1%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -183,7 +182,7 @@ BuildRequires: hamcrest >= 0:1.3-11 BuildRequires: sat4j >= 2.3.5-1 BuildRequires: objectweb-asm >= 5.0.3-1 BuildRequires: sac >= 1.3-12 -BuildRequires: batik-css >= 1.8-0.17 +BuildRequires: batik-css BuildRequires: xml-commons-apis >= 1.4.01-12 BuildRequires: atinject BuildRequires: atinject-tck @@ -235,7 +234,7 @@ Summary: Eclipse OSGi - Equinox Requires: java-headless >= 1:1.7.0 Requires: javapackages-tools Requires: eclipse-filesystem -Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version} +Provides: osgi(system.bundle) = %{epoch}:%{version} %description equinox-osgi Eclipse OSGi - Equinox @@ -267,7 +266,7 @@ Requires: lucene-queryparser >= %{_lucene_version} Requires: lucene-analyzers-smartcn >= %{_lucene_version} Requires: sat4j >= 2.3.5-1 Requires: sac >= 1.3-12 -Requires: batik-css >= 1.8-0.17 +Requires: batik-css Requires: xml-commons-apis >= 1.4.01-12 Requires: atinject Requires: eclipse-ecf-core >= 3.13.1-1 @@ -276,8 +275,8 @@ Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp >= 2.2.5 Requires: glassfish-servlet-api >= 3.1.0 Requires: icu4j >= 1:54.1.1-2 -Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release} -Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-swt = %{epoch}:%{version}-%{release} +Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release} Requires: httpcomponents-core Requires: httpcomponents-client Requires: xz-java @@ -290,8 +289,8 @@ Java Development Tools or the Plugin Development Environment. Summary: Eclipse Java Development Tools BuildArch: noarch -Provides: %{name} = %{epoch}:%{eclipse_version}-%{release} -Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Provides: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: junit >= 4.10-5 Requires: hamcrest-core >= 0:1.3-11 @@ -302,8 +301,8 @@ developing software written in the Java programming language. %package pde Summary: Eclipse Plugin Development Environment -Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} -Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-platform = %{epoch}:%{version}-%{release} +Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: objectweb-asm >= 5.0.3-1 Recommends: eclipse-e4-importer # For PDE Build wrapper script + creating jars @@ -318,7 +317,7 @@ developing Eclipse plugins. Summary: Eclipse p2 Discovery BuildArch: noarch -Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-platform = %{epoch}:%{version}-%{release} # Obsoletes added in F22 Obsoletes: %{name}-p2-discovery < 1:4.5.0-0.10 @@ -331,7 +330,7 @@ installer UIs. %package contributor-tools Summary: Tools for Eclipse Contributors -Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-platform = %{epoch}:%{version}-%{release} %description contributor-tools This package contains tools specifically for Eclipse contributors. It includes @@ -380,6 +379,11 @@ tar --strip-components=1 -xf %{SOURCE1} %patch26 %patch27 +# Use ecj when bootstrapping +%if %{bootstrap} +sed -i -e 's/groupId>org.eclipse.jdtorg.eclipse.tycho - 1:4.6.1-1 +- Update to Neon.1 release. +- Set qualifiers at source-modification-time instead of build-time, to + eliminate descrepancies between architectures, rhbz#1374938 +- Set bootstrap flag for new primary architecture. + * Fri Sep 2 2016 Alexander Kurtakov 1:4.6.0-7 - Rebuild for latest jsch. diff --git a/get-eclipse.sh b/get-eclipse.sh index e5aa9a1..75bfa08 100755 --- a/get-eclipse.sh +++ b/get-eclipse.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git -TAG=S4_6_0_RC4a +TAG=S4_6_1_RC4 rm -rf R4_platform-aggregator-$TAG rm -rf R4_platform-aggregator-$TAG.tar.xz @@ -13,7 +13,7 @@ pushd R4_platform-aggregator-$TAG git submodule init git submodule update -rm -rf production streams scripts +rm -rf production scripts # Comment this line to get a shallow clone. find . -type d -name ".git" | xargs rm -rf diff --git a/sources b/sources index 68e5ee8..47b4ca5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3cb6c1fadf0a42e7dffb2e2be6c78c93 R4_platform-aggregator-S4_6_0_RC4a.tar.xz +b302f16c7fd7301a05960745c17eed89 R4_platform-aggregator-S4_6_1_RC4.tar.xz e03ce6ced9cf27fccc8d0fc5a68e28e0 org.eclipse.linuxtools.eclipse-build-4e8087f81be00857cd9cdce549392db2a985155a.tar.xz