This update was tested against Qt 6.8.1, but there was some unforseen breakage with Qt 6.7.3 still in main. Consolidate two local patches into a single patch from upstream. Reported by: pkg-fallout
