]> git.gag.com Git - fw/altos/commitdiff
new upstream release obsoletes patch set debian/1.9.20-1
authorBdale Garbee <bdale@gag.com>
Mon, 24 Mar 2025 19:13:33 +0000 (13:13 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 24 Mar 2025 19:13:33 +0000 (13:13 -0600)
debian/patches/anotherone.patch [deleted file]
debian/patches/jfreechart-1.5.5.patch [deleted file]
debian/patches/more-includes.patch [deleted file]
debian/patches/series
debian/patches/use-smaller-crt0.patch [deleted file]

diff --git a/debian/patches/anotherone.patch b/debian/patches/anotherone.patch
deleted file mode 100644 (file)
index 5267fa7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
-index 47ba3d427..777b6855d 100644
---- a/altosui/AltosGraphUI.java
-+++ b/altosui/AltosGraphUI.java
-@@ -29,7 +29,7 @@ import org.altusmetrum.altosuilib_14.*;
- import org.jfree.chart.ChartPanel;
- import org.jfree.chart.JFreeChart;
--import org.jfree.ui.RefineryUtilities;
-+import org.jfree.chart.ui.UIUtils;
- public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener, AltosFilterListener
- {
-diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java
-index e9fc68310..2b693bae7 100644
---- a/telegps/TeleGPSGraphUI.java
-+++ b/telegps/TeleGPSGraphUI.java
-@@ -32,7 +32,7 @@ import org.altusmetrum.altosuilib_14.*;
- import org.jfree.chart.ChartPanel;
- import org.jfree.chart.JFreeChart;
--import org.jfree.ui.RefineryUtilities;
-+import org.jfree.chart.ui.UIUtils;
- public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener, AltosFilterListener
- {
diff --git a/debian/patches/jfreechart-1.5.5.patch b/debian/patches/jfreechart-1.5.5.patch
deleted file mode 100644 (file)
index eb4593f..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-From 733e0269e3a33a6795e1b98d0e15a0a239610252 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-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 <keithp@keithp.com>
----
- 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/more-includes.patch b/debian/patches/more-includes.patch
deleted file mode 100644 (file)
index 3977652..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9694440cd501a9b170fec7c85fe57f1e4fe749b3 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Thu, 26 Sep 2024 08:23:48 -0700
-Subject: [PATCH] src: Add more includes to ao.h
-
-This makes sure altos has all of the C library definitions it needs
-rather than on relying on the C library to expose more than POSIX
-says it should.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
- src/kernel/ao.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/kernel/ao.h b/src/kernel/ao.h
-index b3f780f5c..0437cb07f 100644
---- a/src/kernel/ao.h
-+++ b/src/kernel/ao.h
-@@ -19,10 +19,11 @@
- #ifndef _AO_H_
- #define _AO_H_
--#include <stdint.h>
-+#include <inttypes.h>
- #include <stdio.h>
- #include <string.h>
- #include <stddef.h>
-+#include <stdarg.h>
- #include <stdbool.h>
- #include <ao_pins.h>
- #include <ao_arch.h>
--- 
-2.45.2
-
index cb6881760abcd901cace7bd0aa6e02243f367e31..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,4 +0,0 @@
-more-includes.patch
-use-smaller-crt0.patch
-jfreechart-1.5.5.patch
-anotherone.patch
diff --git a/debian/patches/use-smaller-crt0.patch b/debian/patches/use-smaller-crt0.patch
deleted file mode 100644 (file)
index ed8e595..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13ca1bb20a199447f6e478871f459498d2928bc2 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Sun, 16 Feb 2025 14:03:30 -0800
-Subject: [PATCH] altos: Use smaller crt0 for stm boot loader
-
-This eliminates some of unnecessary startup code and saves a bit of
-flash.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
- src/stm/Makefile-flash.defs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs
-index 776811586..3b0f0bad0 100644
---- a/src/stm/Makefile-flash.defs
-+++ b/src/stm/Makefile-flash.defs
-@@ -35,7 +35,7 @@ IDPRODUCT=0x000a
- CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS)
--LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Taltos-loader.ld -n
-+LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Taltos-loader.ld -n --crt0=minimal
- PROGNAME=$(HARDWARE)-altos-flash
- PROG=$(PROGNAME)-$(VERSION).elf
--- 
-2.47.2
-