From 2224bc232e373f577337051512c5891c1826e906 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 12 Nov 2014 12:05:42 +0000 Subject: [PATCH] Backport patch to make workspace selection dialog visible in the task manager - Tidy up SWT symlinks --- eclipse-workspace-chooser.patch | 28 ++++++++++++++++++++ eclipse.spec | 47 ++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 eclipse-workspace-chooser.patch diff --git a/eclipse-workspace-chooser.patch b/eclipse-workspace-chooser.patch new file mode 100644 index 0000000..f8dd1a7 --- /dev/null +++ b/eclipse-workspace-chooser.patch @@ -0,0 +1,28 @@ +From ba6d6b9708a06fa267240471407c239d02484821 Mon Sep 17 00:00:00 2001 +From: Timo Kinnunen +Date: Fri, 7 Nov 2014 15:28:21 +0100 +Subject: Fixed bug 429308: Make workspace selection dialog visible in the task + manager of the OS + +Signed-off-by: Timo Kinnunen +diff --git a/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java +index 4797d2d..d88f57f 100644 +--- a/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java ++++ b/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java +@@ -314,7 +314,12 @@ public class IDEApplication implements IApplication, IExecutableExtension { + URL url = null; + do { + // okay to use the shell now - this is the splash shell +- new ChooseWorkspaceDialog(shell, launchData, false, true).prompt(force); ++ new ChooseWorkspaceDialog(shell, launchData, false, true) { ++ @Override ++ protected Shell getParentShell() { ++ return null; ++ } ++ }.prompt(force); + String instancePath = launchData.getSelection(); + if (instancePath == null) { + return null; +-- +cgit v0.10.1-9-gd18e + diff --git a/eclipse.spec b/eclipse.spec index 6a6da60..e3f715a 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -38,7 +38,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: %{?scl_prefix}eclipse Version: %{eclipse_version} -Release: 6%{?dist} +Release: 7%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -122,6 +122,9 @@ Patch25: %{pkg_name}-support-symlink-bundles.patch # the plugin in the top-level category so it still gets bundled. Patch26: %{pkg_name}-feature-plugins-to-category-ius.patch +# Make workspace selection dialog visible in the task manager of the OS +Patch27: eclipse-workspace-chooser.patch + BuildRequires: rsync BuildRequires: make, gcc BuildRequires: gtk2-devel @@ -157,8 +160,8 @@ BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} -BuildRequires: %{?scl_prefix}lucene-core >= 4.10.1 -BuildRequires: %{?scl_prefix}lucene-analysis >= 4.10.1 +BuildRequires: %{?scl_prefix}lucene-core >= 4.10.2 +BuildRequires: %{?scl_prefix}lucene-analysis >= 4.10.2 BuildRequires: junit >= 4.10-5 BuildRequires: hamcrest >= 0:1.1-11 BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1 @@ -230,8 +233,8 @@ Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version} Requires: jsch >= 0.1.46-2 -Requires: %{?scl_prefix}lucene-core >= 4.10.1 -Requires: %{?scl_prefix}lucene-analysis >= 4.10.1 +Requires: %{?scl_prefix}lucene-core >= 4.10.2 +Requires: %{?scl_prefix}lucene-analysis >= 4.10.2 Requires: %{?scl_prefix}sat4j >= 2.3.5-1 Requires: sac >= 1.3-12 Requires: batik >= 1.8 @@ -336,6 +339,7 @@ tar --strip-components=1 -xf %{SOURCE1} %patch24 -p1 %patch25 %patch26 +%patch27 -p1 #Disable as many things as possible to make the build faster. We care only for Eclipse. %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder @@ -568,6 +572,7 @@ popd #eclipse # Some directories we need install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir} +install -d -m 755 $RPM_BUILD_ROOT%{_jnidir} install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name} install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}/dropins @@ -621,28 +626,23 @@ install -m 755 jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT%{_bindir}/efj TARGET_LAUNCHER=%{_libdir}/%{pkg_name}/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/plugins | grep launcher_[0-9]*` sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT%{_bindir}/efj -#eclipse binary +# Symlink eclipse binary pushd $RPM_BUILD_ROOT%{_bindir} ln -s %{_libdir}/%{pkg_name}/eclipse popd -#SWT is now a folder, but we need to provide jars for others that depend on it. -pushd $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name} -pushd plugins +# SWT is a directory, but we need to provide jars for others that depend on it +pushd $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}/plugins SWT_JAR=`ls | grep swt.gtk` -#it's a dir now -cd ${SWT_JAR} -#fix privileges -#zip the contents -zip -r "../../swt.jar" * -popd - ln -s swt.jar swt-gtk.jar - mkdir -p ../../lib/java - ln -s %{_libdir}/%{pkg_name}/swt.jar ../../lib/java/swt.jar +(cd ${SWT_JAR} && zip -r "../../swt.jar" * ) popd -#eclipse ini -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ +# Symlink SWT jar +pushd $RPM_BUILD_ROOT/%{_jnidir}/ + ln -s %{_libdir}/%{pkg_name}/swt.jar +popd + +# Symlink eclipse ini pushd $RPM_BUILD_ROOT/%{_sysconfdir}/ ln -s %{_libdir}/%{pkg_name}/eclipse.ini popd @@ -778,9 +778,8 @@ fi %{_libdir}/%{pkg_name}/epl-v10.html %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.* -%{_libdir}/%{pkg_name}/swt-gtk*.jar %{_libdir}/%{pkg_name}/swt.jar -%{_libdir}/../lib/java/swt.jar +%{_jnidir}/swt.jar %files platform -f .mfiles-platform %{_bindir}/%{pkg_name} @@ -1027,6 +1026,10 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Wed Nov 12 2014 Mat Booth - 1:4.4.1-7 +- Backport patch to make workspace selection dialog visible in the task manager +- Tidy up SWT symlinks + * Wed Oct 29 2014 Roland Grunberg - 1:4.4.1-6 - Change external plugin references to requirements. - List external plugin references in the top-level category.