From 77006d5736d0b3277d53348c7a10245ffaaf45d0 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Fri, 17 Jun 2022 19:30:29 +0200
Subject: [PATCH] Try and make work on Ubuntu 20 again.

---
 .github/workflows/ccpp.yml     | 2 +-
 src/fe-analysedriveresponse.cc | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 4010e08c..8110a3cf 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build-linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
     - name: apt
diff --git a/src/fe-analysedriveresponse.cc b/src/fe-analysedriveresponse.cc
index fe463648..09be7dbc 100644
--- a/src/fe-analysedriveresponse.cc
+++ b/src/fe-analysedriveresponse.cc
@@ -152,7 +152,7 @@ static void do_in_steps(double c1, double c2, double lo, double hi,
 }
 
 static void draw_y_axis(Agg2D& painter, double x, double y1, double y2,
-		double lo, double hi, double step, const char* format)
+		double lo, double hi, double step, const std::string& format)
 {
 	painter.noFill();
 	painter.lineColor(0, 0, 0);
@@ -164,12 +164,12 @@ static void draw_y_axis(Agg2D& painter, double x, double y1, double y2,
 	{
 		painter.line(x, y, x-5, y);
 		painter.text(
-			x-8, y+5.0, fmt::format(fmt::runtime(format), v));
+			x-8, y+5.0, fmt::format(format, v));
 	});
 }
 
 static void draw_x_axis(Agg2D& painter, double x1, double x2, double y,
-		double lo, double hi, double step, const char* format)
+		double lo, double hi, double step, const std::string& format)
 {
 	painter.noFill();
 	painter.lineColor(0, 0, 0);
@@ -181,7 +181,7 @@ static void draw_x_axis(Agg2D& painter, double x1, double x2, double y,
 	{
 		painter.line(x, y, x, y+5);
 		painter.text(
-			x, y+18, fmt::format(fmt::runtime(format), v));
+			x, y+18, fmt::format(format, v));
 	});
 }