I used 30.0.50 as the version number for the `defcustom' and
`make-obsolete-variable' in the patches.  This should be correct but
feel free to change as needed.

I opened the bug 61546 as well, which changes some stuff to
`calendar-buffer' specifically.  With this change, those also need to be
replaced with `calendar-buffer-name', though these patches do not do so
(should not be doing so, at the very least).