• Update calibre to 4.0.0
• Sort plist using C locale
• Import upstream patch to fix regression in this release [1]

Obtained from: https://github.com/kovidgoyal/calibre/commit/e0630cadd345a1b368a2f552cbae08ac1e4da3c6 [1]