From 83676a76143d89900bf069b2b8605d8ee5978d17 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: May 14 2015 20:45:24 +0000 Subject: Update to upstream 3.15.0. --- diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch index ead7f4d..c5e374a 100644 --- a/eclipse-mylyn-merge-incubator.patch +++ b/eclipse-mylyn-merge-incubator.patch @@ -3,7 +3,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.web.tasks_feature" label="%featureName" - version="3.14.0.qualifier" + version="3.15.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> @@ -15,7 +15,7 @@ @@ -13,8 +13,7 @@ id="org.eclipse.mylyn.trac.wiki_feature" label="%featureName" - version="3.14.0.qualifier" + version="3.15.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.mylyn.sandbox.ui"> + provider-name="%providerName"> diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec index b6c8a08..5213b27 100644 --- a/eclipse-mylyn.spec +++ b/eclipse-mylyn.spec @@ -1,9 +1,9 @@ -%global tag R_3_14_2 -%global incubator_tag e963896478edf4fb7b4474895b15c6359aaa9a17 +%global tag R_3_15_0 +%global incubator_tag 081d8e57fce6e4eb28cd2faa0fe6f778feb12e48 Name: eclipse-mylyn Summary: Eclipse Mylyn main feature. -Version: 3.14.2 +Version: 3.15.0 Release: 1%{?dist} License: EPL URL: http://www.eclipse.org/mylyn @@ -23,6 +23,7 @@ Patch4: %{name}-bug-419133.patch Patch5: lucene4.patch Patch6: %{name}-remove-nullable-annotation.patch Patch7: explicit-hamcrest-use.patch +Patch8: mars0.patch BuildArch: noarch @@ -211,6 +212,9 @@ pushd org.eclipse.mylyn.tasks popd %patch6 %patch7 +pushd org.eclipse.mylyn.context +%patch8 -p1 +popd # Disable plugins we can live without (they are skipped by default anyway) for p in findbugs-maven-plugin maven-pmd-plugin jacoco-maven-plugin ; do @@ -257,6 +261,18 @@ rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/in sed -i -e "s/compatible/greaterOrEqual/g" org.eclipse.mylyn.versions/org.eclipse.mylyn.versions.sdk-feature/feature.xml sed -i -e "s/e3.5/e3.6/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-target/pom.xml +#Be more tolerant for objenesis +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.context/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.ui.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.ui.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core.osgi.tests/META-INF/MANIFEST.MF +sed -i -e "s/1.0.0,2.0.0/1.0.0,3.0.0/g" org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.html.tests/META-INF/MANIFEST.MF + #Set source level to 1.8 for bundles which require it sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF @@ -331,6 +347,9 @@ install %{SOURCE6} \ %files tests -f .mfiles-tests %changelog +* Thu May 14 2015 Alexander Kurtakov 3.15.0-1 +- Update to upstream 3.15.0. + * Thu Feb 19 2015 Alexander Kurtakov 3.14.2-1 - Update to upstream 3.14.2. diff --git a/explicit-hamcrest-use.patch b/explicit-hamcrest-use.patch index d4f23b6..08f53e5 100644 --- a/explicit-hamcrest-use.patch +++ b/explicit-hamcrest-use.patch @@ -1,13 +1,3 @@ ---- org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.tests/META-INF/MANIFEST.MF.orig 2015-01-23 15:54:17.141768216 +0000 -+++ org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.tests/META-INF/MANIFEST.MF 2015-01-23 15:54:34.055533521 +0000 -@@ -9,6 +9,7 @@ - Bundle-ActivationPolicy: lazy - Bundle-Activator: org.eclipse.mylyn.internal.wikitext.tests.WikiTextTestsPlugin - Require-Bundle: org.junit;bundle-version="4.8", -+ org.hamcrest.core, - org.eclipse.mylyn.wikitext.core;bundle-version="2.0.0", - org.eclipse.mylyn.wikitext.core.osgi;bundle-version="2.0.0", - org.eclipse.mylyn.wikitext.core.ant;bundle-version="2.0.0", --- org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF.orig 2015-01-29 14:13:38.896674915 +0000 +++ org.eclipse.mylyn.tasks/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF 2015-01-29 14:14:28.583954615 +0000 @@ -7,8 +7,7 @@ diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh index cee783b..0b1fbf7 100755 --- a/fetch-eclipse-mylyn-incubator.sh +++ b/fetch-eclipse-mylyn-incubator.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="e963896478edf4fb7b4474895b15c6359aaa9a17" +RELEASE_TAG="081d8e57fce6e4eb28cd2faa0fe6f778feb12e48" FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-incubator-fetched-src" #clean up old runs diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh index b457636..38f264b 100755 --- a/fetch-eclipse-mylyn.sh +++ b/fetch-eclipse-mylyn.sh @@ -2,7 +2,7 @@ set -e -RELEASE_TAG="R_3_14_2" +RELEASE_TAG="R_3_15_0" FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src" #clean up old runs diff --git a/mars0.patch b/mars0.patch new file mode 100644 index 0000000..5812246 --- /dev/null +++ b/mars0.patch @@ -0,0 +1,205 @@ +From f60c77916d9c37ef94438461e4b442c8b4ab79cb Mon Sep 17 00:00:00 2001 +From: Sam Davis +Date: Mon, 20 Apr 2015 16:54:56 -0700 +Subject: 462801: remove marker view decoration + +Change-Id: I1589801c215ac8ba896a476e583958e140c4305d +Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=462801 + +diff --git a/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java b/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java +index 38a154f..fe922be 100644 +--- a/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java ++++ b/org.eclipse.mylyn.debug.ui/src/org/eclipse/mylyn/internal/debug/ui/FocusBreakpointsViewAction.java +@@ -36,7 +36,6 @@ public class FocusBreakpointsViewAction extends AbstractFocusMarkerViewAction { + IDebugView view = (IDebugView) viewPart; + Viewer viewer = view.getViewer(); + if (viewer instanceof StructuredViewer) { +- updateMarkerViewLabelProvider((StructuredViewer) viewer); + viewers.add((StructuredViewer) viewer); + } + } +diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java +index db4e98f..8246e99 100644 +--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java ++++ b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/ide/ui/AbstractFocusMarkerViewAction.java +@@ -17,19 +17,15 @@ import java.util.List; + + import org.eclipse.core.runtime.IStatus; + import org.eclipse.core.runtime.Status; +-import org.eclipse.jface.viewers.IBaseLabelProvider; + import org.eclipse.jface.viewers.StructuredViewer; +-import org.eclipse.jface.viewers.TableViewer; + import org.eclipse.mylyn.commons.core.StatusHandler; + import org.eclipse.mylyn.context.ui.AbstractFocusViewAction; + import org.eclipse.mylyn.context.ui.InterestFilter; + import org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin; + import org.eclipse.mylyn.internal.ide.ui.MarkerInterestFilter; +-import org.eclipse.mylyn.internal.ide.ui.MarkerViewLabelProvider; + import org.eclipse.ui.IViewPart; + import org.eclipse.ui.internal.views.markers.ExtendedMarkersView; + import org.eclipse.ui.internal.views.markers.MarkersTreeViewer; +-import org.eclipse.ui.views.markers.internal.TableViewLabelProvider; + + /** + * @author Mik Kersten +@@ -49,18 +45,10 @@ public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAct + } + + /** +- * HACK: should use platform decorating label provider +- * +- * @param viewer ++ * @deprecated This functionality is no longer supported + */ ++ @Deprecated + protected void updateMarkerViewLabelProvider(StructuredViewer viewer) { +- if (viewer != null) { +- IBaseLabelProvider currentProvider = viewer.getLabelProvider(); +- if (currentProvider instanceof TableViewLabelProvider +- && !(currentProvider instanceof MarkerViewLabelProvider)) { +- viewer.setLabelProvider(new MarkerViewLabelProvider((TableViewLabelProvider) currentProvider)); +- } +- } + } + + /** +@@ -78,9 +66,6 @@ public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAct + Field field = clazz.getDeclaredField("viewer"); //$NON-NLS-1$ + field.setAccessible(true); + cachedViewer = (MarkersTreeViewer) field.get(viewPart); +- if (cachedViewer != null && !cachedViewer.getControl().isDisposed()) { +- updateMarkerViewLabelProvider(cachedViewer); +- } + } + } catch (Exception e) { + StatusHandler.log(new Status(IStatus.ERROR, IdeUiBridgePlugin.ID_PLUGIN, +@@ -92,19 +77,4 @@ public abstract class AbstractFocusMarkerViewAction extends AbstractFocusViewAct + } + return viewers; + } +- +- @Override +- public void update() { +- super.update(); +- cachedViewer = null; +- for (StructuredViewer viewer : getViewers()) { +- if (viewer instanceof TableViewer) { +- TableViewer tableViewer = (TableViewer) viewer; +- if (!(tableViewer.getLabelProvider() instanceof MarkerViewLabelProvider)) { +- tableViewer.setLabelProvider(new MarkerViewLabelProvider( +- (TableViewLabelProvider) tableViewer.getLabelProvider())); +- } +- } +- } +- } + } +diff --git a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java b/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java +deleted file mode 100644 +index a335796..0000000 +--- a/org.eclipse.mylyn.ide.ui/src/org/eclipse/mylyn/internal/ide/ui/MarkerViewLabelProvider.java ++++ /dev/null +@@ -1,101 +0,0 @@ +-/******************************************************************************* +- * Copyright (c) 2004, 2008 Tasktop Technologies and others. +- * All rights reserved. This program and the accompanying materials +- * are made available under the terms of the Eclipse Public License v1.0 +- * which accompanies this distribution, and is available at +- * http://www.eclipse.org/legal/epl-v10.html +- * +- * Contributors: +- * Tasktop Technologies - initial API and implementation +- *******************************************************************************/ +- +-package org.eclipse.mylyn.internal.ide.ui; +- +-import org.eclipse.jface.viewers.IColorProvider; +-import org.eclipse.jface.viewers.IFontProvider; +-import org.eclipse.jface.viewers.ILabelProviderListener; +-import org.eclipse.jface.viewers.ITableLabelProvider; +-import org.eclipse.mylyn.commons.ui.compatibility.CommonFonts; +-import org.eclipse.mylyn.context.core.ContextCore; +-import org.eclipse.mylyn.context.core.IInteractionElement; +-import org.eclipse.mylyn.context.ui.ContextUi; +-import org.eclipse.swt.graphics.Color; +-import org.eclipse.swt.graphics.Font; +-import org.eclipse.swt.graphics.Image; +-import org.eclipse.ui.views.markers.internal.ConcreteMarker; +-import org.eclipse.ui.views.markers.internal.TableViewLabelProvider; +- +-/** +- * @author Mik Kersten +- */ +-public class MarkerViewLabelProvider implements ITableLabelProvider, IColorProvider, IFontProvider { +- +- private final TableViewLabelProvider provider; +- +- public MarkerViewLabelProvider(TableViewLabelProvider provider) { +- this.provider = provider; +- } +- +- public Font getFont(Object element) { +- if (element instanceof ConcreteMarker) { +- String handle = ContextCore.getStructureBridge(((ConcreteMarker) element).getResource().getFileExtension()) +- .getHandleForOffsetInObject((element), 0); +- IInteractionElement node = ContextCore.getContextManager().getElement(handle); +- if (node != null) { +- if (node.getInterest().isLandmark() && !node.getInterest().isPropagated()) { +- return CommonFonts.BOLD; +- } +- } +- } +- return null; +- } +- +- public Image getColumnImage(Object element, int columnIndex) { +- return provider.getColumnImage(element, columnIndex); +- } +- +- public String getColumnText(Object element, int columnIndex) { +- return provider.getColumnText(element, columnIndex); +- } +- +- public Color getForeground(Object element) { +- if (element instanceof ConcreteMarker) { +- String handle = ContextCore.getStructureBridge(((ConcreteMarker) element).getResource().getFileExtension()) +- .getHandleForOffsetInObject((element), 0); +- return ContextUi.getForeground(ContextCore.getContextManager().getElement(handle)); +- } else { +- return null; +- } +- } +- +- public Color getBackground(Object element) { +- return null; +-// if (element instanceof ConcreteMarker) { +-// String handle = ContextCore.getStructureBridge( +-// ((ConcreteMarker) element).getResource().getFileExtension()).getHandleForOffsetInObject((element), +-// 0); +-// return UiUtil.getBackgroundForElement(ContextCorePlugin.getContextManager().getElement(handle)); +-// } else { +-// return null; +-// } +- } +- +- /** +- * TODO: handle listeners? +- */ +- public void addListener(ILabelProviderListener listener) { +- // provider.addListener(listener); +- } +- +- public void dispose() { +- provider.dispose(); +- } +- +- public boolean isLabelProperty(Object element, String property) { +- return provider.isLabelProperty(element, property); +- } +- +- public void removeListener(ILabelProviderListener listener) { +- // removeListener(listener); +- } +-} +-- +cgit v0.10.1-9-gd18e + diff --git a/sources b/sources index 53f064f..5b3e67b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -09dbe06a20507620fa1a0e5c2535b9be eclipse-mylyn-R_3_14_2-fetched-src.tar.xz -464f25c33cb15af8e45ae707d7a609f1 eclipse-mylyn-e963896478edf4fb7b4474895b15c6359aaa9a17-incubator-fetched-src.tar.xz +f2bac16582914e381a29e6067c1d7b93 eclipse-mylyn-R_3_15_0-fetched-src.tar.xz +27ccad62a46fb9866da188c46bfac9c4 eclipse-mylyn-081d8e57fce6e4eb28cd2faa0fe6f778feb12e48-incubator-fetched-src.tar.xz