From 09279563d3e2b6e17d346678e6fe025d411034df Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 3 Mar 2025 11:18:16 -0700 Subject: [PATCH] fix for libjfreechart api change --- debian/changelog | 7 ++ debian/patches/jfreechart-1.5.5.patch | 158 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 166 insertions(+) create mode 100644 debian/patches/jfreechart-1.5.5.patch diff --git a/debian/changelog b/debian/changelog index f4f0df46..19504064 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +altos (1.9.19-4) unstable; urgency=medium + + * cherry-pick patch from master branch that updates libjfreechart usage + to reflect changes in version 1.5.5, closes: #1099215 + + -- Bdale Garbee Mon, 03 Mar 2025 11:17:25 -0700 + altos (1.9.19-3) unstable; urgency=medium * cherry-pick patch from master branch that moves to smaller crt0 to diff --git a/debian/patches/jfreechart-1.5.5.patch b/debian/patches/jfreechart-1.5.5.patch new file mode 100644 index 00000000..eb4593fa --- /dev/null +++ b/debian/patches/jfreechart-1.5.5.patch @@ -0,0 +1,158 @@ +From 733e0269e3a33a6795e1b98d0e15a0a239610252 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Tue, 25 Feb 2025 15:12:40 -0800 +Subject: [PATCH] altosuilib: Adapt to jfreechart 1.5.5 update + +Incompatible changes require source updates. + +Signed-off-by: Keith Packard +--- + altosuilib/AltosGraph.java | 2 +- + altosuilib/AltosUIAxis.java | 2 +- + altosuilib/AltosUIEnable.java | 2 +- + altosuilib/AltosUIFlightSeries.java | 2 +- + altosuilib/AltosUIGraph.java | 4 ++-- + altosuilib/AltosUIGrapher.java | 2 +- + altosuilib/AltosUILineStyle.java | 2 +- + altosuilib/AltosUIMarker.java | 2 +- + altosuilib/AltosUITimeSeries.java | 4 ++-- + 9 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java +index 46dc80f36..393c8cc6b 100644 +--- a/altosuilib/AltosGraph.java ++++ b/altosuilib/AltosGraph.java +@@ -25,7 +25,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java +index 75722d12b..a31af5a28 100644 +--- a/altosuilib/AltosUIAxis.java ++++ b/altosuilib/AltosUIAxis.java +@@ -25,7 +25,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +diff --git a/altosuilib/AltosUIEnable.java b/altosuilib/AltosUIEnable.java +index 380693017..973117f36 100644 +--- a/altosuilib/AltosUIEnable.java ++++ b/altosuilib/AltosUIEnable.java +@@ -27,7 +27,7 @@ import java.util.concurrent.*; + import java.util.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +diff --git a/altosuilib/AltosUIFlightSeries.java b/altosuilib/AltosUIFlightSeries.java +index 7e64cc2e2..51f9c959f 100644 +--- a/altosuilib/AltosUIFlightSeries.java ++++ b/altosuilib/AltosUIFlightSeries.java +@@ -19,7 +19,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java +index 12176070f..ca60e1a04 100644 +--- a/altosuilib/AltosUIGraph.java ++++ b/altosuilib/AltosUIGraph.java +@@ -26,7 +26,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +@@ -155,7 +155,7 @@ public class AltosUIGraph implements AltosUnitsListener, AltosShapeListener { + chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT, + plot, true); + +- ChartUtilities.applyCurrentTheme(chart); ++ ChartUtils.applyCurrentTheme(chart); + + plot.setDomainGridlinePaint(gridline_color); + plot.setRangeGridlinePaint(gridline_color); +diff --git a/altosuilib/AltosUIGrapher.java b/altosuilib/AltosUIGrapher.java +index 9f5cd3f16..8310b1df6 100644 +--- a/altosuilib/AltosUIGrapher.java ++++ b/altosuilib/AltosUIGrapher.java +@@ -25,7 +25,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +diff --git a/altosuilib/AltosUILineStyle.java b/altosuilib/AltosUILineStyle.java +index 5b0238bec..a7bdbf45c 100644 +--- a/altosuilib/AltosUILineStyle.java ++++ b/altosuilib/AltosUILineStyle.java +@@ -21,7 +21,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +diff --git a/altosuilib/AltosUIMarker.java b/altosuilib/AltosUIMarker.java +index 37ae2e85c..3f112faed 100644 +--- a/altosuilib/AltosUIMarker.java ++++ b/altosuilib/AltosUIMarker.java +@@ -25,7 +25,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +diff --git a/altosuilib/AltosUITimeSeries.java b/altosuilib/AltosUITimeSeries.java +index 63d5c0574..80669c268 100644 +--- a/altosuilib/AltosUITimeSeries.java ++++ b/altosuilib/AltosUITimeSeries.java +@@ -25,7 +25,7 @@ import java.awt.*; + import javax.swing.*; + import org.altusmetrum.altoslib_14.*; + +-import org.jfree.ui.*; ++import org.jfree.chart.ui.*; + import org.jfree.chart.*; + import org.jfree.chart.plot.*; + import org.jfree.chart.axis.*; +@@ -141,7 +141,7 @@ public class AltosUITimeSeries extends AltosTimeSeries implements AltosUIGrapher + units.graph_units()), + new java.text.DecimalFormat(time_example), + new java.text.DecimalFormat(example)); +- renderer.setBaseToolTipGenerator(ttg); ++ renderer.setSeriesToolTipGenerator(0, ttg); + } + set_data(); + } +-- +2.47.2 + diff --git a/debian/patches/series b/debian/patches/series index 79812e2f..44f6506a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ more-includes.patch use-smaller-crt0.patch +jfreechart-1.5.5.patch -- 2.47.2