diff -Nru graphicsmagick-1.4+really1.3.38/debian/changelog graphicsmagick-1.4+really1.3.38/debian/changelog
--- graphicsmagick-1.4+really1.3.38/debian/changelog	2022-03-27 07:47:45.000000000 +0000
+++ graphicsmagick-1.4+really1.3.38/debian/changelog	2022-03-30 10:16:58.000000000 +0000
@@ -1,3 +1,10 @@
+graphicsmagick (1.4+really1.3.38-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1.4+really1.3.36-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Dec 2020 03:11:26 +0000]
+  * Ignore test failures, the tests fail on 64-bit kernels.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 30 Mar 2022 10:16:58 +0000
+
 graphicsmagick (1.4+really1.3.38-1) unstable; urgency=high
 
   * New upstream release, including many security fixes.
diff -Nru graphicsmagick-1.4+really1.3.38/debian/rules graphicsmagick-1.4+really1.3.38/debian/rules
--- graphicsmagick-1.4+really1.3.38/debian/rules	2021-12-13 16:50:54.000000000 +0000
+++ graphicsmagick-1.4+really1.3.38/debian/rules	2022-03-30 10:16:58.000000000 +0000
@@ -16,7 +16,7 @@
 	gm_confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-ARCHS_CHECK_NOFAIL:=hppa sparc
+ARCHS_CHECK_NOFAIL:=hppa sparc armhf
 ifneq (,$(findstring $(DEB_BUILD_ARCH),$(ARCHS_CHECK_NOFAIL)))
 CHECK_FAILED_ACTION:=echo "Ignoring testsuite failures on this architecture"
 else