diff -Nru simgear-2020.3.18+dfsg/debian/changelog simgear-2020.3.18+dfsg/debian/changelog
--- simgear-2020.3.18+dfsg/debian/changelog	2023-07-07 21:34:24.000000000 +0000
+++ simgear-2020.3.18+dfsg/debian/changelog	2024-04-07 09:19:19.000000000 +0000
@@ -1,3 +1,11 @@
+simgear (1:2020.3.18+dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream patch to add missing <array> include. Closes: #1060926.
+  * Add a patch to fix "Bad request count" failures in testUpdateNoChanges.
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Sun, 07 Apr 2024 12:19:19 +0300
+
 simgear (1:2020.3.18+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru simgear-2020.3.18+dfsg/debian/patches/Fix-a-new-Clang-compile-failure-with-current-XCode.patch simgear-2020.3.18+dfsg/debian/patches/Fix-a-new-Clang-compile-failure-with-current-XCode.patch
--- simgear-2020.3.18+dfsg/debian/patches/Fix-a-new-Clang-compile-failure-with-current-XCode.patch	1970-01-01 00:00:00.000000000 +0000
+++ simgear-2020.3.18+dfsg/debian/patches/Fix-a-new-Clang-compile-failure-with-current-XCode.patch	2024-04-07 09:19:19.000000000 +0000
@@ -0,0 +1,21 @@
+From: James Turner <zakalawe@mac.com>
+Date: Fri, 3 Feb 2023 11:24:47 +0000
+Subject: Fix a new Clang compile failure with current XCode
+
+(cherry picked from commit 319e6e3a3aeb84f1ea6dc55be72b24558c705528)
+---
+ simgear/scene/viewer/Compositor.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/simgear/scene/viewer/Compositor.hxx b/simgear/scene/viewer/Compositor.hxx
+index f7e538c..44fd420 100644
+--- a/simgear/scene/viewer/Compositor.hxx
++++ b/simgear/scene/viewer/Compositor.hxx
+@@ -19,6 +19,7 @@
+ 
+ #include <unordered_map>
+ #include <vector>
++#include <array>
+ 
+ // For osgUtil::LineSegmentIntersector::Intersections, which is a typedef.
+ #include <osgUtil/LineSegmentIntersector>
diff -Nru simgear-2020.3.18+dfsg/debian/patches/Remove-top-level-.dirhash-before-running-testUpdateNoChan.patch simgear-2020.3.18+dfsg/debian/patches/Remove-top-level-.dirhash-before-running-testUpdateNoChan.patch
--- simgear-2020.3.18+dfsg/debian/patches/Remove-top-level-.dirhash-before-running-testUpdateNoChan.patch	1970-01-01 00:00:00.000000000 +0000
+++ simgear-2020.3.18+dfsg/debian/patches/Remove-top-level-.dirhash-before-running-testUpdateNoChan.patch	2024-04-07 09:19:19.000000000 +0000
@@ -0,0 +1,36 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Sat, 6 Apr 2024 22:23:07 +0300
+Subject: Remove top-level .dirhash before running testUpdateNoChanges
+
+During the first test (testBasicClone), some files inside dirB are
+deleted or modified. This causes rebuild of dirB/.dirindex and
+dirB/.dirhash, but does not update the top-level .dirhash.
+
+That hash cache is only updated when the size or the last modified
+time of dirB/.dirindex differs from the size or timestamp in the
+.dirhash file. However, the size does not change in our case, and
+the timestamp has granularity of one second, so if the test runs
+quickly enough, the timestamps will match even after the contents of
+dirB/.dirindex changed.
+
+So testUpdateNoChanges was flaky: sometimes it passed, and sometimes
+failed with "Bad request count" exception when comparing request
+count for dirB. This change stabilizes it.
+
+Forwarded: https://sourceforge.net/p/flightgear/simgear/merge-requests/127/
+---
+ simgear/io/test_repository.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/simgear/io/test_repository.cxx b/simgear/io/test_repository.cxx
+index ad4e956..ca380f2 100644
+--- a/simgear/io/test_repository.cxx
++++ b/simgear/io/test_repository.cxx
+@@ -474,6 +474,7 @@ void testUpdateNoChanges(HTTP::Client* cl)
+ 	std::unique_ptr<HTTPRepository> repo;
+ 	SGPath p(simgear::Dir::current().path());
+ 	p.append("http_repo_basic"); // same as before
++	(p / ".dirhash").remove();
+ 
+ 	global_repo->clearRequestCounts();
+ 
diff -Nru simgear-2020.3.18+dfsg/debian/patches/series simgear-2020.3.18+dfsg/debian/patches/series
--- simgear-2020.3.18+dfsg/debian/patches/series	2023-07-07 21:30:49.000000000 +0000
+++ simgear-2020.3.18+dfsg/debian/patches/series	2024-04-07 09:19:19.000000000 +0000
@@ -6,3 +6,5 @@
 spelling_fixes.patch
 fix-ftbfs-on-armel-armhf.patch
 fix-atomic-build-riscv64.patch
+Fix-a-new-Clang-compile-failure-with-current-XCode.patch
+Remove-top-level-.dirhash-before-running-testUpdateNoChan.patch