From 8f6a284b38d8b380ad2c7c560911f700187cea50 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sep 02 2014 15:29:11 +0000 Subject: Update to git snapshot of 3.1 - Drop upstreamed patches --- diff --git a/.gitignore b/.gitignore index 3d70b66..f4d17b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ /org.eclipse.linuxtools-*.tar.bz2 +/org.eclipse.linuxtools-*/ /noarch /*.rpm /.build-*.log +/.project diff --git a/disable-libhover-lttng.patch b/disable-libhover-lttng.patch index 73e80ec..365219a 100644 --- a/disable-libhover-lttng.patch +++ b/disable-libhover-lttng.patch @@ -1,5 +1,5 @@ ---- releng/org.eclipse.linuxtools.releng-site/category.xml.orig 2014-05-09 21:01:50.000000000 +0300 -+++ releng/org.eclipse.linuxtools.releng-site/category.xml 2014-05-09 21:57:05.684711303 +0300 +--- releng/org.eclipse.linuxtools.releng-site/category.xml.orig 2014-08-29 15:05:30.000000000 +0100 ++++ releng/org.eclipse.linuxtools.releng-site/category.xml 2014-09-02 14:17:38.955843894 +0100 @@ -4,18 +4,6 @@ Nightly builds of Linux Tools project. @@ -19,7 +19,7 @@ -@@ -55,15 +43,6 @@ +@@ -55,18 +43,6 @@ @@ -32,10 +32,13 @@ - - - +- +- +- -@@ -79,9 +58,6 @@ +@@ -82,34 +58,13 @@ @@ -43,9 +46,12 @@ - - - +- +- +- + -@@ -92,21 +68,6 @@ + @@ -67,7 +73,7 @@ -@@ -116,9 +77,6 @@ +@@ -119,9 +74,6 @@ @@ -77,7 +83,7 @@ -@@ -146,15 +104,6 @@ +@@ -149,18 +101,6 @@ @@ -90,10 +96,13 @@ - - - +- +- +- -@@ -173,12 +122,6 @@ +@@ -179,12 +119,6 @@ @@ -106,13 +115,3 @@ Eclipse Linux Tools -@@ -194,9 +137,4 @@ - Eclipse Linux Tools source features and bundles - - -- -- -- Optional LTTng features -- -- - diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index bdeca15..68c18ba 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -2,32 +2,28 @@ %{!?scl:%global pkg_name %{name}} %global eclipse_dropin %{_datadir}/eclipse/dropins +%global git_tag 7c21d231a9144b7f271ae43cb34ff74a99de8819 Name: %{?scl_prefix}eclipse-linuxtools -Version: 3.0.0 -Release: 6%{?dist} +Version: 3.1.0 +Release: 0.1.git7c21d231%{?dist} Summary: Linux specific Eclipse plugins License: EPL URL: http://eclipse.org/linuxtools/ -#Main directory changed to not be git sha but version as tycho fails with path too long otherwise -Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{version}.tar.bz2 +Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{git_tag}.tar.bz2 Patch0: disable-libhover-lttng.patch -Patch1: rpm-menu.patch -Patch2: piechart.patch -Patch3: toolpath-msgs.patch -BuildRequires: tycho >= 0.20.0-6 -BuildRequires: tycho-extras +BuildRequires: tycho >= 0.21.0 +BuildRequires: tycho-extras BuildRequires: %{?scl_prefix}eclipse-cdt BuildRequires: %{?scl_prefix}eclipse-jdt BuildRequires: %{?scl_prefix}swt-chart >= 0.9.0 BuildRequires: %{?scl_prefix}eclipse-remote BuildRequires: eclipse-license -BuildRequires: maven-clean-plugin BuildRequires: eclipse-swtbot -BuildRequires: %{?scl_prefix}eclipse-gef -BuildRequires: osgi(org.eclipse.ptp.remote.core) +BuildRequires: eclipse-gef +BuildRequires: eclipse-ptp-rdt BuildRequires: exec-maven-plugin BuildArch: noarch @@ -138,16 +134,17 @@ All test bundles for the Linux Tools project. %prep -%setup -q -n org.eclipse.linuxtools-%{version} +%setup -q -n org.eclipse.linuxtools-%{git_tag} %patch0 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %pom_remove_plugin org.jacoco:jacoco-maven-plugin %pom_disable_module lttng %pom_disable_module libhover +# Don't use target platform +%pom_disable_module org.eclipse.linuxtools.target releng +sed -i '//,/<\/target>/ d' pom.xml + # Do not package swt-chart sed -i '/org.swtchart/,/<\/iu>/ d' releng/org.eclipse.linuxtools.releng-site/category.xml @@ -155,11 +152,7 @@ sed -i '/org.swtchart/,/<\/iu>/ d' releng/org.eclipse.linuxtools.releng-site/cat rm -fr profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractRemoteTest.java rm -fr perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchRemoteTest.java -#Disable createrepo tests because createrepo is not shipped. -%pom_disable_module org.eclipse.linuxtools.rpm.createrepo.tests rpm - %build -%{?scl:%scl_maven_opts} export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" xmvn -o clean verify -Dmaven.test.skip=true @@ -244,8 +237,6 @@ testjar=`ls oprofile/org.eclipse.linuxtools.oprofile.tests/target/*.jar | grep - mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins testjar=`ls valgrind/org.eclipse.linuxtools.valgrind.tests/target/*.jar | grep -v sources` mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins -testjar=`ls systemtap/org.eclipse.linuxtools.systemtap.ui.tests/target/*.jar | grep -v sources` -mv ${testjar} %{buildroot}%{_javadir}/linuxtools-tests/plugins ### oprofile install.sh stuff ### pushd %{buildroot}%{eclipse_dropin}/oprofile/plugins @@ -309,6 +300,10 @@ popd %{_javadir}/linuxtools-tests %changelog +* Tue Sep 02 2014 Mat Booth - 3.1.0-0.1.git7c21d231 +- Update to git snapshot of 3.1 +- Drop upstreamed patches + * Tue Aug 12 2014 Jeff Johnston 3.0.0-6 - Fix messages in tools path properties page. - Fix commented out pie-chart patch. diff --git a/piechart.patch b/piechart.patch deleted file mode 100644 index dfa1786..0000000 --- a/piechart.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -up ./profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF.fix ./profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF ---- ./profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF.fix 2014-08-06 15:14:05.700850277 -0400 -+++ ./profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF 2014-08-06 15:14:16.676044730 -0400 -@@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier - Bundle-Vendor: %bundleProvider - Bundle-Localization: plugin - Require-Bundle: org.eclipse.ui, -- org.swtchart -+ org.swtchart;bundle-version="0.9.0" - Bundle-RequiredExecutionEnvironment: JavaSE-1.7 - Bundle-ActivationPolicy: lazy - Export-Package: org.eclipse.linuxtools.dataviewers.piechart -diff -up ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java.fix ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java ---- ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java.fix 2014-08-06 15:10:24.583838639 -0400 -+++ ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java 2014-08-06 15:11:41.721260565 -0400 -@@ -21,6 +21,7 @@ import org.swtchart.Chart; - import org.swtchart.IAxis; - import org.swtchart.IBarSeries; - import org.swtchart.ISeries; -+import org.swtchart.ITitle; - - public class PieChart extends Chart { - -@@ -35,7 +36,12 @@ public class PieChart extends Chart { - axis.getTitle().setVisible(false); - } - getPlotArea().setVisible(false); -+ // Make the title draw after the pie-chart itself so we can modify the title -+ // to center over the pie-chart area -+ ITitle title = getTitle(); -+ removePaintListener((PaintListener)title); - addPaintListener(pieChartPaintListener = new PieChartPaintListener(this)); -+ addPaintListener((PaintListener)title); - IAxis xAxis = getAxisSet().getXAxis(0); - xAxis.enableCategory(true); - xAxis.setCategorySeries(new String[]{""}); //$NON-NLS-1$ -diff -up ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java.fix ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java ---- ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java.fix 2014-08-06 15:10:31.248962584 -0400 -+++ ./profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java 2014-08-06 15:12:37.674276098 -0400 -@@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Control; - import org.eclipse.swt.widgets.Display; - import org.swtchart.IBarSeries; - import org.swtchart.ISeries; -+import org.swtchart.ITitle; - import org.swtchart.Range; - - public class PieChartPaintListener implements PaintListener { -@@ -40,6 +41,8 @@ public class PieChartPaintListener imple - private int[][] pieSliceAngles; - private int pieWidth; - -+ private String origTitleText; -+ - /** - * Handles drawing and updating of a PieChart, with titles given to its legend and - * to each of its pies. Pies will be drawn in the given chart's plot area. -@@ -60,6 +63,7 @@ public class PieChartPaintListener imple - pieSliceAngles = new int[seriesValues.length][]; - if (seriesValues.length == 0) { - bounds = gc.getClipping(); -+ Font oldFont = gc.getFont(); - Font font = new Font(Display.getDefault(), FONT, 15, SWT.BOLD); - gc.setForeground(BLACK); - gc.setFont(font); -@@ -67,15 +71,21 @@ public class PieChartPaintListener imple - Point textSize = e.gc.textExtent(text); - gc.drawText(text, (bounds.width - textSize.x) / 2, (bounds.height - textSize.y) / 2); - font.dispose(); -+ gc.setFont(oldFont); - return; - } - bounds = plotArea.getBounds(); -- setTitleBounds(bounds); -+ // Adjust the title so it centers in the plot area -+ if (origTitleText == null) { -+ origTitleText = chart.getTitle().getText(); -+ } -+ adjustTitle(e); - int width = bounds.width / seriesValues.length; - int x = bounds.x; - - if (chart.getLegend().isVisible()) { - Rectangle legendBounds = ((Control) chart.getLegend()).getBounds(); -+ Font oldFont = gc.getFont(); - Font font = new Font(Display.getDefault(), FONT, 10, SWT.BOLD); - gc.setForeground(BLACK); - gc.setFont(font); -@@ -83,6 +93,7 @@ public class PieChartPaintListener imple - Point textSize = e.gc.textExtent(text); - gc.drawText(text, legendBounds.x + (legendBounds.width - textSize.x) / 2, legendBounds.y - textSize.y); - font.dispose(); -+ gc.setFont(oldFont); - } - - pieWidth = Math.min(width - X_GAP, bounds.height); -@@ -92,10 +103,24 @@ public class PieChartPaintListener imple - } - } - -- private void setTitleBounds(Rectangle bounds) { -- Control title = (Control) chart.getTitle(); -- Rectangle titleBounds = title.getBounds(); -- title.setLocation(new Point(bounds.x + (bounds.width - titleBounds.width) / 2, title.getLocation().y)); -+ // Adjust the title with trailing blanks so it centers in the plot area -+ // rather than for the entire chart view which looks odd when not -+ // centered above the pie-charts themselves. -+ private void adjustTitle(PaintEvent pe) { -+ ITitle title = chart.getTitle(); -+ Font font = title.getFont(); -+ Font oldFont = pe.gc.getFont(); -+ pe.gc.setFont(font); -+ Control legend = (Control)chart.getLegend(); -+ Rectangle legendBounds = legend.getBounds(); -+ int adjustment = legendBounds.width - 15; -+ Point blankSize = pe.gc.textExtent(" "); //$NON-NLS-1$ -+ int numBlanks = ((adjustment / blankSize.x) >> 1) << 1; -+ String text = origTitleText; -+ for (int i = 0; i < numBlanks; ++i) -+ text += " "; //$NON-NLS-1$ -+ pe.gc.setFont(oldFont); -+ title.setText(text); - } - - private void drawPieChart(PaintEvent e, int chartnum, Rectangle bounds) { -@@ -143,6 +168,7 @@ public class PieChartPaintListener imple - gc.drawLine(pieCenters[chartnum].x, pieCenters[chartnum].y, pieCenters[chartnum].x, pieCenters[chartnum].y - pieWidth / 2); - } - -+ Font oldFont = gc.getFont(); - Font font = new Font(Display.getDefault(), FONT, 12, SWT.BOLD); - gc.setForeground(BLACK); - gc.setBackground(WHITE); -@@ -151,6 +177,7 @@ public class PieChartPaintListener imple - Point textSize = e.gc.textExtent(text); - gc.drawText(text, pieX + (pieWidth - textSize.x) / 2, pieY + pieWidth + textSize.y); - font.dispose(); -+ gc.setFont(oldFont); - } - - private void getPieSeriesArray() { diff --git a/rpm-menu.patch b/rpm-menu.patch deleted file mode 100644 index 5f47693..0000000 --- a/rpm-menu.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/plugin.xml b/rpm/org.eclipse.linuxtools.rpm.ui/plugin.xml -index adf12a5..d6a533f 100644 ---- a/rpm/org.eclipse.linuxtools.rpm.ui/plugin.xml -+++ b/rpm/org.eclipse.linuxtools.rpm.ui/plugin.xml -@@ -99,7 +99,11 @@ - name="%extension.name" - point="org.eclipse.ui.menus"> - -+ locationURI="popup:org.eclipse.ui.popup.any?after=additions" > -+ -+ - - - -+ -+ - - - diff --git a/sources b/sources index a75ce81..9811080 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3af287d3d3442add6816e60e2ddfe35 org.eclipse.linuxtools-3.0.0.tar.bz2 +02be5ef91b1071bf899626badbb6c9c8 org.eclipse.linuxtools-7c21d231a9144b7f271ae43cb34ff74a99de8819.tar.bz2 diff --git a/toolpath-msgs.patch b/toolpath-msgs.patch deleted file mode 100644 index e84a876..0000000 --- a/toolpath-msgs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/Messages.java.fix ./profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/Messages.java ---- ./profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/Messages.java.fix 2014-08-11 17:54:09.288754150 -0400 -+++ ./profiling/org.eclipse.linuxtools.tools.launch.ui/src/org/eclipse/linuxtools/internal/tools/launch/ui/Messages.java 2014-08-11 19:12:00.901131895 -0400 -@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal. - import org.eclipse.osgi.util.NLS; - - public class Messages extends NLS { -- private static final String BUNDLE_NAME = Activator.PLUGIN_ID + ".messages"; //$NON-NLS-1$ -+ private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.tools.launch.ui.messages"; //$NON-NLS-1$ - public static String LINUXTOOLS_PATH; - public static String LINUXTOOLS_PATH_COMBO; - public static String LINUXTOOLS_PATH_TOOLTIP;