Thanks for your updated patches! You still haven't ran indent-code.el on
them, but I fixed that on my side. I also took the liberty to define the
inputs of ztoolkit-rsvg in terms of the ztoolkit package, like this:

@@ -4119,7 +4119,6 @@ minimum.")
     (arguments
      `(#:configure-flags `("-Denable_rsvg=true")))
     (inputs
-     `(("cairo" ,cairo)
-       ("librsvg" ,librsvg)
-       ("libx11" ,libx11)))
+     `(("librsvg" ,librsvg)
+       ,@(package-inputs ztoolkit)))
     (synopsis "ZToolkit with SVG support")))

Your patches have been applied on master, with the last commit being
d3e7282ec35d87842e8143f0230e27fd5ec5e74d

Cheers!